Menu
▾
▴
springframework-cvs — CVS Commit Notification List
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(387) |
May
(1066) |
Jun
(689) |
Jul
(504) |
Aug
(697) |
Sep
(660) |
Oct
(591) |
Nov
(393) |
Dec
(324) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(567) |
Feb
(448) |
Mar
(461) |
Apr
(368) |
May
(887) |
Jun
(243) |
Jul
(429) |
Aug
(670) |
Sep
(648) |
Oct
(684) |
Nov
(599) |
Dec
(317) |
| 2008 |
Jan
(388) |
Feb
(400) |
Mar
(323) |
Apr
(214) |
May
(228) |
Jun
(120) |
Jul
(168) |
Aug
(64) |
Sep
(78) |
Oct
(127) |
Nov
(28) |
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(22) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Thomas R. <tri...@us...> - 2008-11-07 20:22:37
|
Update of /cvsroot/springframework/spring/src/org/springframework/jdbc/support In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30307/src/org/springframework/jdbc/support Modified Files: SQLErrorCodes.java Log Message: SPR-5272: added sort to the categories that didn't have it Index: SQLErrorCodes.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/jdbc/support/SQLErrorCodes.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SQLErrorCodes.java 16 Oct 2008 19:17:16 -0000 1.16 --- SQLErrorCodes.java 7 Nov 2008 20:22:24 -0000 1.17 *************** *** 106,110 **** public void setInvalidResultSetAccessCodes(String[] invalidResultSetAccessCodes) { ! this.invalidResultSetAccessCodes = invalidResultSetAccessCodes; } --- 106,110 ---- public void setInvalidResultSetAccessCodes(String[] invalidResultSetAccessCodes) { ! this.invalidResultSetAccessCodes = StringUtils.sortStringArray(invalidResultSetAccessCodes); } *************** *** 130,134 **** public void setDataAccessResourceFailureCodes(String[] dataAccessResourceFailureCodes) { ! this.dataAccessResourceFailureCodes = dataAccessResourceFailureCodes; } --- 130,134 ---- public void setDataAccessResourceFailureCodes(String[] dataAccessResourceFailureCodes) { ! this.dataAccessResourceFailureCodes = StringUtils.sortStringArray(dataAccessResourceFailureCodes); } *************** *** 138,142 **** public void setTransientDataAccessResourceCodes(String[] transientDataAccessResourceCodes) { ! this.transientDataAccessResourceCodes = transientDataAccessResourceCodes; } --- 138,142 ---- public void setTransientDataAccessResourceCodes(String[] transientDataAccessResourceCodes) { ! this.transientDataAccessResourceCodes = StringUtils.sortStringArray(transientDataAccessResourceCodes); } *************** *** 154,158 **** public void setDeadlockLoserCodes(String[] deadlockLoserCodes) { ! this.deadlockLoserCodes = deadlockLoserCodes; } --- 154,158 ---- public void setDeadlockLoserCodes(String[] deadlockLoserCodes) { ! this.deadlockLoserCodes = StringUtils.sortStringArray(deadlockLoserCodes); } *************** *** 162,166 **** public void setCannotSerializeTransactionCodes(String[] cannotSerializeTransactionCodes) { ! this.cannotSerializeTransactionCodes = cannotSerializeTransactionCodes; } --- 162,166 ---- public void setCannotSerializeTransactionCodes(String[] cannotSerializeTransactionCodes) { ! this.cannotSerializeTransactionCodes = StringUtils.sortStringArray(cannotSerializeTransactionCodes); } |
|
From: Juergen H. <jho...@us...> - 2008-10-31 17:21:58
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19610 Modified Files: build.xml Log Message: removed bnd from distribution Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.318 retrieving revision 1.319 diff -C2 -d -r1.318 -r1.319 *** build.xml 31 Oct 2008 16:29:43 -0000 1.318 --- build.xml 31 Oct 2008 17:21:52 -0000 1.319 *************** *** 2178,2182 **** <include name="lib/aopalliance/**"/> <include name="lib/bsh/**"/> - <include name="lib/bnd/**"/> <include name="lib/c3p0/**"/> <include name="lib/caucho/**"/> --- 2178,2181 ---- |
|
From: Juergen H. <jho...@us...> - 2008-10-31 17:21:58
|
Update of /cvsroot/springframework/spring/lib In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19610/lib Modified Files: readme.txt Log Message: removed bnd from distribution Index: readme.txt =================================================================== RCS file: /cvsroot/springframework/spring/lib/readme.txt,v retrieving revision 1.216 retrieving revision 1.217 diff -C2 -d -r1.216 -r1.217 *** readme.txt 17 Oct 2008 15:59:45 -0000 1.216 --- readme.txt 31 Oct 2008 17:21:52 -0000 1.217 *************** *** 36,43 **** - required at runtime when using Spring's BeanShell support - * bnd/bnd.jar - - BND tool 0.0.208 (http://www.aqute.biz/Code/Bnd) - - required for adding OSGi entries to the jar manifests at build time - * c3p0/c3p0-0.9.1.2.jar - C3P0 0.9.1.2 connection pool (http://sourceforge.net/projects/c3p0) --- 36,39 ---- |
|
From: Juergen H. <jho...@us...> - 2008-10-31 17:20:16
|
Update of /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19537/tiger/test/org/springframework/orm/jpa/hibernate Modified Files: hibernate-manager.xml Log Message: removed depends-on clause Index: hibernate-manager.xml =================================================================== RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate/hibernate-manager.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** hibernate-manager.xml 28 Oct 2008 00:08:21 -0000 1.13 --- hibernate-manager.xml 31 Oct 2008 17:20:12 -0000 1.14 *************** *** 13,18 **** <!-- <context:spring-configured/> TODO --> ! <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" ! depends-on="org.springframework.context.config.internalBeanConfigurerAspect"> <property name="persistenceXmlLocation" value="org/springframework/orm/jpa/domain/persistence-context.xml"/> <property name="dataSource" ref="dataSource"/> --- 13,17 ---- <!-- <context:spring-configured/> TODO --> ! <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <property name="persistenceXmlLocation" value="org/springframework/orm/jpa/domain/persistence-context.xml"/> <property name="dataSource" ref="dataSource"/> |
Update of /cvsroot/springframework/spring/maven In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19191/maven Modified Files: spring-aspects.pom spring-tomcat-weaver.pom spring-core.pom spring-test.pom spring-aop.pom spring-context.pom spring.pom spring-web.pom spring-context-support.pom spring-webmvc-portlet.pom spring-agent.pom spring-jms.pom spring-orm.pom spring-tx.pom spring-beans.pom spring-webmvc-struts.pom spring-webmvc.pom spring-jdbc.pom Log Message: prepared for 2.5.6 release Index: spring-core.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-core.pom,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** spring-core.pom 28 Oct 2008 13:04:32 -0000 1.29 --- spring-core.pom 31 Oct 2008 17:11:58 -0000 1.30 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Core</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Core</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Core</name> ! <version>2.5.6</version> <description>Spring Framework: Core</description> <url>http://www.springframework.org</url> Index: spring.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring.pom,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** spring.pom 28 Oct 2008 13:04:32 -0000 1.44 --- spring.pom 31 Oct 2008 17:11:58 -0000 1.45 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework</name> ! <version>2.5.6</version> <description>Spring Framework</description> <url>http://www.springframework.org</url> Index: spring-web.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-web.pom,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** spring-web.pom 28 Oct 2008 13:04:32 -0000 1.33 --- spring-web.pom 31 Oct 2008 17:11:58 -0000 1.34 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web</name> ! <version>2.5.6</version> <description>Spring Framework: Web</description> <url>http://www.springframework.org</url> Index: spring-jdbc.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-jdbc.pom,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** spring-jdbc.pom 28 Oct 2008 13:04:32 -0000 1.31 --- spring-jdbc.pom 31 Oct 2008 17:11:58 -0000 1.32 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: JDBC</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: JDBC</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: JDBC</name> ! <version>2.5.6</version> <description>Spring Framework: JDBC</description> <url>http://www.springframework.org</url> Index: spring-tx.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-tx.pom,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** spring-tx.pom 28 Oct 2008 13:04:32 -0000 1.23 --- spring-tx.pom 31 Oct 2008 17:11:58 -0000 1.24 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Transaction</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Transaction</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Transaction</name> ! <version>2.5.6</version> <description>Spring Framework: Transaction</description> <url>http://www.springframework.org</url> Index: spring-context-support.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-context-support.pom,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** spring-context-support.pom 28 Oct 2008 13:04:32 -0000 1.28 --- spring-context-support.pom 31 Oct 2008 17:11:58 -0000 1.29 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Context Support</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Context Support</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Context Support</name> ! <version>2.5.6</version> <description>Spring Framework: Context Support</description> <url>http://www.springframework.org</url> Index: spring-jms.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-jms.pom,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** spring-jms.pom 28 Oct 2008 13:04:32 -0000 1.27 --- spring-jms.pom 31 Oct 2008 17:11:58 -0000 1.28 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: JMS</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: JMS</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: JMS</name> ! <version>2.5.6</version> <description>Spring Framework: JMS</description> <url>http://www.springframework.org</url> Index: spring-orm.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-orm.pom,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spring-orm.pom 28 Oct 2008 13:04:32 -0000 1.26 --- spring-orm.pom 31 Oct 2008 17:11:58 -0000 1.27 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: ORM</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: ORM</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: ORM</name> ! <version>2.5.6</version> <description>Spring Framework: ORM</description> <url>http://www.springframework.org</url> Index: spring-context.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-context.pom,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** spring-context.pom 28 Oct 2008 13:04:32 -0000 1.30 --- spring-context.pom 31 Oct 2008 17:11:58 -0000 1.31 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Context</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Context</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Context</name> ! <version>2.5.6</version> <description>Spring Framework: Context</description> <url>http://www.springframework.org</url> Index: spring-aspects.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-aspects.pom,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** spring-aspects.pom 28 Oct 2008 13:04:32 -0000 1.30 --- spring-aspects.pom 31 Oct 2008 17:11:58 -0000 1.31 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Aspects</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Aspects</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Aspects</name> ! <version>2.5.6</version> <description>Spring Framework: Aspects</description> <url>http://www.springframework.org</url> Index: spring-beans.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-beans.pom,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** spring-beans.pom 28 Oct 2008 13:04:32 -0000 1.27 --- spring-beans.pom 31 Oct 2008 17:11:58 -0000 1.28 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Beans</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Beans</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Beans</name> ! <version>2.5.6</version> <description>Spring Framework: Beans</description> <url>http://www.springframework.org</url> Index: spring-aop.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-aop.pom,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** spring-aop.pom 28 Oct 2008 13:04:32 -0000 1.32 --- spring-aop.pom 31 Oct 2008 17:11:58 -0000 1.33 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: AOP</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: AOP</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: AOP</name> ! <version>2.5.6</version> <description>Spring Framework: AOP</description> <url>http://www.springframework.org</url> Index: spring-webmvc.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc.pom,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** spring-webmvc.pom 28 Oct 2008 13:04:32 -0000 1.35 --- spring-webmvc.pom 31 Oct 2008 17:11:58 -0000 1.36 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC</description> <url>http://www.springframework.org</url> Index: spring-webmvc-struts.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc-struts.pom,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** spring-webmvc-struts.pom 28 Oct 2008 13:04:32 -0000 1.23 --- spring-webmvc-struts.pom 31 Oct 2008 17:11:58 -0000 1.24 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC Struts</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC Struts</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC Struts</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC Struts</description> <url>http://www.springframework.org</url> Index: spring-tomcat-weaver.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-tomcat-weaver.pom,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spring-tomcat-weaver.pom 28 Oct 2008 13:04:32 -0000 1.26 --- spring-tomcat-weaver.pom 31 Oct 2008 17:11:58 -0000 1.27 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Tomcat Weaver</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Tomcat Weaver</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Tomcat Weaver</name> ! <version>2.5.6</version> <description>Spring Framework: Tomcat Weaver</description> <url>http://www.springframework.org</url> Index: spring-test.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-test.pom,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** spring-test.pom 28 Oct 2008 13:04:32 -0000 1.22 --- spring-test.pom 31 Oct 2008 17:11:58 -0000 1.23 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Test</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Test</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Test</name> ! <version>2.5.6</version> <description>Spring Framework: Test</description> <url>http://www.springframework.org</url> Index: spring-webmvc-portlet.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc-portlet.pom,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** spring-webmvc-portlet.pom 28 Oct 2008 13:04:32 -0000 1.22 --- spring-webmvc-portlet.pom 31 Oct 2008 17:11:58 -0000 1.23 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC Portlet</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC Portlet</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC Portlet</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC Portlet</description> <url>http://www.springframework.org</url> Index: spring-agent.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-agent.pom,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spring-agent.pom 28 Oct 2008 13:04:32 -0000 1.26 --- spring-agent.pom 31 Oct 2008 17:11:58 -0000 1.27 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Agent</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Agent</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Agent</name> ! <version>2.5.6</version> <description>Spring Framework: Agent</description> <url>http://www.springframework.org</url> |
|
From: Juergen H. <jho...@us...> - 2008-10-31 16:29:55
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17541 Modified Files: changelog.txt build.xml Log Message: prepared for 2.5.6 release Index: changelog.txt =================================================================== RCS file: /cvsroot/springframework/spring/changelog.txt,v retrieving revision 1.739 retrieving revision 1.740 diff -C2 -d -r1.739 -r1.740 *** changelog.txt 24 Oct 2008 10:36:32 -0000 1.739 --- changelog.txt 31 Oct 2008 16:29:43 -0000 1.740 *************** *** 4,8 **** ! Changes in version 2.5.6 (2008-10-27) ------------------------------------- --- 4,8 ---- ! Changes in version 2.5.6 (2008-10-31) ------------------------------------- *************** *** 21,24 **** --- 21,25 ---- Package org.springframework.beans + * BeanUtils skips conventional editor check for array classes (in order to not break AspectJ weaving) * BeanWrapper's introspection resolves bridge methods to find setter method for getter method with covariant return type * TypeMismatchException message differentiates between editor with inappropriate value returned versus no editor at all *************** *** 108,112 **** * HibernateTemplate's "loadAll" operation selects distinct root entities (avoiding duplicate entries in result list) * HibernateTemplate translates Hibernate's DataException into a Spring DataIntegrityViolationException (for consistency) ! * fixed HibernateTransactionManager's "earlyFlushBeforeCommit" feature to not switch to FlushMode.NEVER too early * added "packagesToScan" property to Hibernate AnnotationSessionFactoryBean, for autodetection of @Entity classes * HibernateJpaDialect checks "EntityManager.getDelegate()" as well to find Hibernate Session (for Seam compatibility) --- 109,113 ---- * HibernateTemplate's "loadAll" operation selects distinct root entities (avoiding duplicate entries in result list) * HibernateTemplate translates Hibernate's DataException into a Spring DataIntegrityViolationException (for consistency) ! * fixed HibernateTransactionManager's "earlyFlushBeforeCommit" feature to apply to the outermost transaction only * added "packagesToScan" property to Hibernate AnnotationSessionFactoryBean, for autodetection of @Entity classes * HibernateJpaDialect checks "EntityManager.getDelegate()" as well to find Hibernate Session (for Seam compatibility) Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.317 retrieving revision 1.318 diff -C2 -d -r1.317 -r1.318 *** build.xml 30 Oct 2008 14:45:16 -0000 1.317 --- build.xml 31 Oct 2008 16:29:43 -0000 1.318 *************** *** 15,21 **** --> ! <project name="spring-core" default="usage" basedir="." xmlns:maven="antlib:org.apache.maven.artifact.ant" ! xmlns:bundlor="antlib:com.springsource.bundlor.ant"> ! <property file="build.properties"/> --- 15,20 ---- --> ! <project name="spring-core" default="usage" basedir="." xmlns:maven="antlib:org.apache.maven.artifact.ant" ! xmlns:bundlor="antlib:com.springsource.bundlor.ant"> <property file="build.properties"/> *************** *** 212,215 **** --- 211,215 ---- </patternset> + <!-- Jar Jar Links taskdef (required for repackaging ASM) --> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar/jarjar.jar"/> *************** *** 730,736 **** manifestTemplatePath="${bundlor.mf.dir}/org.springframework.test.mf"/> ! <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-tomcat-weaver.jar" outputPath="${dist.dir}/weaving/spring-tomcat-weaver.jar" ! mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" ! manifestTemplatePath="${bundlor.mf.dir}/org.springframework.instrument.classloading.mf"/> <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-tx.jar" outputPath="${dist.dir}/modules/spring-tx.jar" --- 730,736 ---- manifestTemplatePath="${bundlor.mf.dir}/org.springframework.test.mf"/> ! <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-tomcat-weaver.jar" outputPath="${dist.dir}/weaving/spring-tomcat-weaver.jar" ! mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" ! manifestTemplatePath="${bundlor.mf.dir}/org.springframework.instrument.classloading.mf"/> <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-tx.jar" outputPath="${dist.dir}/modules/spring-tx.jar" *************** *** 1030,1033 **** --- 1030,1034 ---- </manifest> </jar> + </target> *************** *** 1242,1246 **** <javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}" windowtitle="Spring Framework API 2.5" ! source="1.5" access="protected" author="true" version="true" use="true" splitindex="true" defaultexcludes="true" stylesheetfile="${doc.dir}/stylesheet.css" overview="${doc.dir}/overview.html"> --- 1243,1247 ---- <javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}" windowtitle="Spring Framework API 2.5" ! source="1.5" access="protected" author="true" version="true" use="true" splitindex="true" defaultexcludes="true" stylesheetfile="${doc.dir}/stylesheet.css" overview="${doc.dir}/overview.html"> *************** *** 1251,1280 **** <arg value="-J-Dhttp.proxyPort=${javadoc.proxyport}"/> <doctitle><![CDATA[<h1>Spring Framework API 2.5</h1>]]></doctitle> ! <header><![CDATA[ ! <a href=\"http://www.springframework.org/\" target=\"_top\">The Spring Framework</a> ! <!-- Begin Google Analytics code --> ! <script type="text/javascript"> ! var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); ! document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); ! </script> ! <script type="text/javascript"> ! var pageTracker = _gat._getTracker("UA-2728886-3"); ! pageTracker._setDomainName("none"); ! pageTracker._setAllowLinker(true); ! pageTracker._trackPageview(); ! </script> ! <!-- End Google Analytics code --> ! ]]></header> ! <bottom><![CDATA[ ! <i>Copyright © 2002-2008 <a href="http://www.springframework.org/" target="_top">The Spring Framework</a>.</i> ! <!-- Begin LoopFuse code --> ! <script src="http://loopfuse.net/webrecorder/js/listen.js" type="text/javascript"> ! </script> ! <script type="text/javascript"> ! _lf_cid = "LF_48be82fa"; ! _lf_remora(); ! </script> ! <!-- End LoopFuse code --> ! ]]></bottom> <classpath refid="all-libs"/> <classpath location="${junit4.jar}"/> --- 1252,1266 ---- <arg value="-J-Dhttp.proxyPort=${javadoc.proxyport}"/> <doctitle><![CDATA[<h1>Spring Framework API 2.5</h1>]]></doctitle> ! <bottom><![CDATA[ ! <i>Copyright © 2002-2008 <a href="http://www.springframework.org/" target="_top">The Spring Framework</a>.</i> ! <!-- Begin LoopFuse code --> ! <script src="http://loopfuse.net/webrecorder/js/listen.js" type="text/javascript"> ! </script> ! <script type="text/javascript"> ! _lf_cid = "LF_48be82fa"; ! _lf_remora(); ! </script> ! <!-- End LoopFuse code --> ! ]]></bottom> <classpath refid="all-libs"/> <classpath location="${junit4.jar}"/> |
|
From: Juergen H. <jho...@us...> - 2008-10-30 17:00:29
|
Update of /cvsroot/springframework/spring/tiger/mock/org/springframework/test/context In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19955/tiger/mock/org/springframework/test/context Modified Files: TestContext.java Log Message: TestContext accesses internal fields directly Index: TestContext.java =================================================================== RCS file: /cvsroot/springframework/spring/tiger/mock/org/springframework/test/context/TestContext.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** TestContext.java 31 Mar 2008 07:15:40 -0000 1.27 --- TestContext.java 30 Oct 2008 17:00:24 -0000 1.28 *************** *** 35,40 **** /** ! * TestContext encapsulates the context in which a test is executed, agnostic of ! * the actual testing framework in use. * * @author Sam Brannen --- 35,40 ---- /** ! * TestContext encapsulates the context in which a test is executed, ! * agnostic of the actual testing framework in use. * * @author Sam Brannen *************** *** 44,53 **** public class TestContext extends AttributeAccessorSupport { - private static final String DEFAULT_CONTEXT_LOADER_CLASS_NAME = "org.springframework.test.context.support.GenericXmlContextLoader"; - private static final long serialVersionUID = -5827157174866681233L; private static final Log logger = LogFactory.getLog(TestContext.class); private final ContextCache contextCache; --- 44,55 ---- public class TestContext extends AttributeAccessorSupport { private static final long serialVersionUID = -5827157174866681233L; + private static final String DEFAULT_CONTEXT_LOADER_CLASS_NAME = + "org.springframework.test.context.support.GenericXmlContextLoader"; + private static final Log logger = LogFactory.getLog(TestContext.class); + private final ContextCache contextCache; *************** *** 118,123 **** * Retrieve {@link ApplicationContext} resource locations for the supplied * {@link Class class}, using the supplied {@link ContextLoader} to ! * {@link ContextLoader#processLocations(Class, String...) process} the ! * locations. * <p>Note that the * {@link ContextConfiguration#inheritLocations() inheritLocations} flag of --- 120,124 ---- * Retrieve {@link ApplicationContext} resource locations for the supplied * {@link Class class}, using the supplied {@link ContextLoader} to ! * {@link ContextLoader#processLocations(Class, String...) process} the locations. * <p>Note that the * {@link ContextConfiguration#inheritLocations() inheritLocations} flag of *************** *** 161,175 **** /** ! * Build an {@link ApplicationContext} for this test context using the ! * configured {@link #getContextLoader() ContextLoader} and ! * {@link #getLocations() resource locations}. * @throws Exception if an error occurs while building the application context */ private ApplicationContext loadApplicationContext() throws Exception { ! Assert.notNull(getContextLoader(), ! "Can not build an ApplicationContext with a NULL 'contextLoader'. Consider annotating your test class with @ContextConfiguration."); ! Assert.notNull(getLocations(), ! "Can not build an ApplicationContext with a NULL 'locations' array. Consider annotating your test class with @ContextConfiguration."); ! return getContextLoader().loadContext(getLocations()); } --- 162,175 ---- /** ! * Build an ApplicationContext for this test context using the ! * configured ContextLoader and resource locations. * @throws Exception if an error occurs while building the application context */ private ApplicationContext loadApplicationContext() throws Exception { ! Assert.notNull(this.contextLoader, "Can not build an ApplicationContext with a NULL 'contextLoader'. " + ! "Consider annotating your test class with @ContextConfiguration."); ! Assert.notNull(this.locations, "Can not build an ApplicationContext with a NULL 'locations' array. " + ! "Consider annotating your test class with @ContextConfiguration."); ! return this.contextLoader.loadContext(this.locations); } *************** *** 177,181 **** * Convert the supplied context <code>key</code> to a String * representation for use in caching, logging, etc. - * @param key the context key to convert to a String */ private String contextKeyString(Serializable key) { --- 177,180 ---- *************** *** 192,202 **** public ApplicationContext getApplicationContext() { ApplicationContext context = null; ! ContextCache cache = getContextCache(); ! synchronized (cache) { ! context = cache.get(contextKeyString(getLocations())); if (context == null) { try { context = loadApplicationContext(); ! cache.put(contextKeyString(getLocations()), context); } catch (Exception ex) { --- 191,200 ---- public ApplicationContext getApplicationContext() { ApplicationContext context = null; ! synchronized (this.contextCache) { ! context = this.contextCache.get(contextKeyString(this.locations)); if (context == null) { try { context = loadApplicationContext(); ! this.contextCache.put(contextKeyString(this.locations), context); } catch (Exception ex) { *************** *** 209,241 **** /** - * Get the {@link ContextCache context cache} for this test context. - * @return the context cache (never <code>null</code>) - */ - ContextCache getContextCache() { - return this.contextCache; - } - - /** - * Get the {@link ContextLoader} to use for loading the - * {@link ApplicationContext} for this test context. - * @return the context loader. May be <code>null</code> if the current - * test context is not configured to use an application context. - */ - ContextLoader getContextLoader() { - return this.contextLoader; - } - - /** - * Get the resource locations to use for loading the - * {@link ApplicationContext} for this test context. - * @return the application context resource locations. - * May be <code>null</code> if the current test context is - * not configured to use an application context. - */ - String[] getLocations() { - return this.locations; - } - - /** * Get the {@link Class test class} for this test context. * @return the test class (never <code>null</code>) --- 207,210 ---- *************** *** 246,250 **** /** ! * Gets the current {@link Object test instance} for this test context. * <p>Note: this is a mutable property. * @return the current test instance (may be <code>null</code>) --- 215,219 ---- /** ! * Get the current {@link Object test instance} for this test context. * <p>Note: this is a mutable property. * @return the current test instance (may be <code>null</code>) *************** *** 256,260 **** /** ! * Gets the current {@link Method test method} for this test context. * <p>Note: this is a mutable property. * @return the current test method (may be <code>null</code>) --- 225,229 ---- /** ! * Get the current {@link Method test method} for this test context. * <p>Note: this is a mutable property. * @return the current test method (may be <code>null</code>) *************** *** 266,270 **** /** ! * Gets the {@link Throwable exception} that was thrown during execution of * the {@link #getTestMethod() test method}. * <p>Note: this is a mutable property. --- 235,239 ---- /** ! * Get the {@link Throwable exception} that was thrown during execution of * the {@link #getTestMethod() test method}. * <p>Note: this is a mutable property. *************** *** 284,292 **** */ public void markApplicationContextDirty() { ! getContextCache().setDirty(contextKeyString(getLocations())); } /** ! * Updates this test context to reflect the state of the currently executing test. * @param testInstance the current test instance (may be <code>null</code>) * @param testMethod the current test method (may be <code>null</code>) --- 253,261 ---- */ public void markApplicationContextDirty() { ! this.contextCache.setDirty(contextKeyString(this.locations)); } /** ! * Update this test context to reflect the state of the currently executing test. * @param testInstance the current test instance (may be <code>null</code>) * @param testMethod the current test method (may be <code>null</code>) *************** *** 294,298 **** * or <code>null</code> if no exception was thrown */ ! synchronized void updateState(Object testInstance, Method testMethod, Throwable testException) { this.testInstance = testInstance; this.testMethod = testMethod; --- 263,267 ---- * or <code>null</code> if no exception was thrown */ ! void updateState(Object testInstance, Method testMethod, Throwable testException) { this.testInstance = testInstance; this.testMethod = testMethod; *************** *** 301,317 **** /** ! * Provides a string representation of this test context's ! * {@link #getTestClass() test class}, ! * {@link #getLocations() application context resource locations}, ! * {@link #getTestInstance() test instance}, ! * {@link #getTestMethod() test method}, and ! * {@link #getTestException() test exception}. */ @Override public String toString() { return new ToStringCreator(this). ! append("testClass", getTestClass()). ! append("locations", getLocations()).append("testInstance", getTestInstance()). ! append("testMethod", getTestMethod()).append("testException", getTestException()). toString(); } --- 270,281 ---- /** ! * Provide a String representation of this test context's state. */ @Override public String toString() { return new ToStringCreator(this). ! append("testClass", this.testClass). ! append("locations", this.locations).append("testInstance", this.testInstance). ! append("testMethod", this.testMethod).append("testException", this.testException). toString(); } |
|
From: Costin L. <cos...@us...> - 2008-10-30 14:47:30
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30479 Modified Files: build.xml Log Message: + lower caucho import version + fix spring-agent weaving Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.316 retrieving revision 1.317 diff -C2 -d -r1.316 -r1.317 *** build.xml 28 Oct 2008 17:12:08 -0000 1.316 --- build.xml 30 Oct 2008 14:45:16 -0000 1.317 *************** *** 686,690 **** classpathref="bundlor-classpath"/> ! <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-agent.jar" outputPath="${dist.dir}/modules/spring-agent.jar" mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" manifestTemplatePath="${bundlor.mf.dir}/org.springframework.instrument.mf"/> --- 686,690 ---- classpathref="bundlor-classpath"/> ! <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-agent.jar" outputPath="${dist.dir}/weaving/spring-agent.jar" mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" manifestTemplatePath="${bundlor.mf.dir}/org.springframework.instrument.mf"/> |
|
From: Costin L. <cos...@us...> - 2008-10-30 14:45:26
|
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30479/osgi/bundlor Modified Files: org.springframework.web.mf org.springframework.mf Log Message: + lower caucho import version + fix spring-agent weaving Index: org.springframework.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.mf 28 Oct 2008 17:49:11 -0000 1.2 --- org.springframework.mf 30 Oct 2008 14:45:16 -0000 1.3 *************** *** 26,30 **** Import-Template: bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, ! com.caucho.*;version="[3.1.5, 4.0.0)";resolution:=optional, com.ibatis.*;version="[2.3.0.677, 3.0.0)";resolution:=optional, com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, --- 26,30 ---- Import-Template: bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, ! com.caucho.*;version="[3.1.3, 4.0.0)";resolution:=optional, com.ibatis.*;version="[2.3.0.677, 3.0.0)";resolution:=optional, com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, Index: org.springframework.web.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.mf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** org.springframework.web.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.web.mf 30 Oct 2008 14:45:16 -0000 1.5 *************** *** 4,8 **** Bundle-ManifestVersion: 2 Import-Template: ! com.caucho.*;version="[3.1.5, 4.0.0)";resolution:=optional, javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional, --- 4,8 ---- Bundle-ManifestVersion: 2 Import-Template: ! com.caucho.*;version="[3.1.3, 4.0.0)";resolution:=optional, javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional, |
|
From: Juergen H. <jho...@us...> - 2008-10-29 15:56:34
|
Update of /cvsroot/springframework/spring/src/org/springframework/beans In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26271/src/org/springframework/beans Modified Files: BeanUtils.java Log Message: BeanUtils skips conventional editor check for array classes (in order to not break AspectJ weaving) Index: BeanUtils.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/BeanUtils.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** BeanUtils.java 21 Jun 2008 20:27:02 -0000 1.63 --- BeanUtils.java 29 Oct 2008 15:56:19 -0000 1.64 *************** *** 361,365 **** */ public static PropertyEditor findEditorByConvention(Class targetType) { ! if (targetType == null || unknownEditorTypes.containsKey(targetType)) { return null; } --- 361,365 ---- */ public static PropertyEditor findEditorByConvention(Class targetType) { ! if (targetType == null || targetType.isArray() || unknownEditorTypes.containsKey(targetType)) { return null; } |
|
From: Costin L. <cos...@us...> - 2008-10-28 17:50:21
|
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21432/osgi/bundlor Modified Files: org.springframework.mf Log Message: + add missing import from spring-core manifest template Index: org.springframework.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.mf 28 Oct 2008 17:12:08 -0000 1.1 --- org.springframework.mf 28 Oct 2008 17:49:11 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- org.aopalliance.*;version="1.0.0" Import-Package: + org.eclipse.core.runtime;common="split";resolution:=optional, com.evermind.server;resolution:=optional, com.ibatis.sqlmap.engine.transaction.external;version="[2.3.0.677, 3.0.0)";resolution:=optional, *************** *** 109,117 **** org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, - org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.hibernate;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.cache;version="[3.2.6.ga, 4.0.0)";resolution:=optional, --- 110,118 ---- org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, + org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.hibernate;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.cache;version="[3.2.6.ga, 4.0.0)";resolution:=optional, |
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16846/osgi/bundlor Modified Files: org.springframework.beans.mf org.springframework.web.mf org.springframework.jms.mf org.springframework.context.support.mf org.springframework.aop.mf org.springframework.transaction.mf org.springframework.jdbc.mf org.springframework.test.mf org.springframework.web.portlet.mf org.springframework.context.mf org.springframework.orm.mf org.springframework.core.mf org.springframework.web.servlet.mf Added Files: org.springframework.mf Log Message: + add manifest template for spring.jar Index: org.springframework.jdbc.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jdbc.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.jdbc.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.jdbc.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 12,20 **** com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional, com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, - javax.naming.*;resolution:=optional, - javax.sql;resolution:=optional, javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, - javax.xml.transform.*;resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, --- 12,17 ---- *************** *** 25,37 **** org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: ! javax.naming.*, ! javax.sql, ! javax.xml.transform.*, ! oracle.sql, ! org.jboss.resource.adapter.jdbc, ! weblogic.jdbc.extensions, ! com.ibm.websphere.rsadapter, ! com.ibm.ws.rsadapter.jdbc, ! org.w3c.dom.* --- 22,26 ---- org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.test.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.test.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.test.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.test.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 5,9 **** Import-Template: javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, - javax.naming.*;resolution:=optional, javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.portlet.*;version="[1.0.0, 2.0.0)";resolution:=optional, --- 5,8 ---- *************** *** 11,15 **** javax.servlet.http;version="[2.4.0, 3.0.0)";resolution:=optional, javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, - javax.sql;resolution:=optional, junit.framework.*;version="[3.8.2, 4.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", --- 10,13 ---- *************** *** 20,23 **** org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional Unversioned-Imports: ! javax.naming.*, ! javax.sql --- 18,20 ---- org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.orm.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.orm.mf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** org.springframework.orm.mf 28 Oct 2008 13:04:32 -0000 1.4 --- org.springframework.orm.mf 28 Oct 2008 17:12:08 -0000 1.5 *************** *** 12,19 **** javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, - javax.sql.*;resolution:=optional, - javax.naming.*;resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, - javax.xml.parsers.*;resolution:=optional, oracle.toplink.essentials.*;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional, oracle.toplink.exceptions;version="[10.1.3, 11.0.0)";resolution:=optional, --- 12,16 ---- *************** *** 65,74 **** org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax;resolution:=optional Unversioned-Imports: ! javax.naming.*, ! javax.sql.*, ! javax.xml.parsers.*, ! org.w3c.dom.*, ! org.xml.sax --- 62,66 ---- org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional, Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.aop.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aop.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.aop.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.aop.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 13,17 **** org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: ! org.w3c.dom.* \ No newline at end of file --- 13,17 ---- org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.web.portlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.portlet.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.web.portlet.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.web.portlet.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 16,20 **** org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: ! org.xml.sax.* --- 16,20 ---- org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * Index: org.springframework.transaction.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.transaction.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.transaction.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.transaction.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 12,17 **** com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, - javax.management.*;resolution:=optional, - javax.naming.*;resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, --- 12,15 ---- *************** *** 27,37 **** org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: ! com.evermind.server, ! com.ibm.ws.Transaction, ! javax.management.*, ! javax.naming.*, ! oracle.j2ee.transaction, ! org.w3c.dom.*, ! weblogic.transaction --- 25,29 ---- org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.beans.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.beans.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.beans.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.beans.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 5,17 **** Import-Template: javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, - javax.xml.parsers.*;resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: ! javax.xml.parsers.*, ! org.w3c.dom.*, ! org.xml.sax.* --- 5,13 ---- Import-Template: javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.web.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.web.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.web.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 5,16 **** Import-Template: com.caucho.*;version="[3.1.5, 4.0.0)";resolution:=optional, - com.sun.net.*;resolution:=optional, javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional, - javax.jws.*;resolution:=optional, javax.servlet;version="[2.4.0, 3.0.0)", javax.servlet.http;version="[2.4.0, 3.0.0)", javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, - javax.xml.namespace.*;resolution:=optional, javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional, --- 5,13 ---- *************** *** 29,36 **** org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: ! com.sun.net.*, ! javax.jws.*, ! javax.xml.namespace.*, ! org.xml.sax.* --- 26,30 ---- org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.context.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.context.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.context.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 10,14 **** bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, com.sun.enterprise.loader.*;version="[1.0.0, 2.0.0)";resolution:=optional, - com.sun.net.*;resolution:=optional, edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, --- 10,13 ---- *************** *** 18,25 **** javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional, - javax.management.*;resolution:=optional, - javax.naming.*;resolution:=optional, - javax.rmi.*;resolution:=optional, - javax.xml.namespace.*;resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, --- 17,20 ---- *************** *** 36,52 **** org.springframework.metadata.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.omg.CORBA.*;resolution:=optional, ! org.omg.CORBA_2_3.*;resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: ! com.ibm.websphere.management, ! com.sun.net.*, ! javax.management.*, ! javax.naming.*, ! javax.rmi.*, ! javax.xml.namespace.*, ! org.omg.CORBA.*, ! org.omg.CORBA_2_3.*, ! org.w3c.dom.*, ! org.xml.sax.* \ No newline at end of file --- 31,35 ---- org.springframework.metadata.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional, Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.context.support.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.support.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.context.support.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.context.support.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 7,13 **** freemarker.*;version="[2.3.12, 3.0.0)";resolution:=optional, javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, - javax.naming.*;resolution:=optional, javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, - javax.sql.*;resolution:=optional, net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, --- 7,11 ---- *************** *** 23,28 **** org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional Unversioned-Imports: ! javax.naming.*, ! javax.sql.* --- 21,26 ---- org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * Index: org.springframework.web.servlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.servlet.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.web.servlet.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.web.servlet.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 15,20 **** javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)";resolution:=optional, javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)";resolution:=optional, - javax.sql.*;resolution:=optional, - javax.xml.transform.*;resolution:=optional, jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, --- 15,18 ---- *************** *** 45,53 **** org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: ! javax.sql.*, ! javax.xml.transform.*, ! org.w3c.dom.*, ! org.xml.sax.* --- 43,47 ---- org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional, Unversioned-Imports: ! * \ No newline at end of file --- NEW FILE: org.springframework.mf --- Bundle-SymbolicName: org.springframework Bundle-Name: Spring Framework Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Excluded-Exports: org.springframework.asm, org.springframework.asm.* Export-Template: org.aopalliance.*;version="1.0.0" Import-Package: com.evermind.server;resolution:=optional, com.ibatis.sqlmap.engine.transaction.external;version="[2.3.0.677, 3.0.0)";resolution:=optional, com.ibm.websphere.management;resolution:=optional, com.ibm.websphere.rsadapter;resolution:=optional, com.ibm.ws.rsadapter.jdbc;resolution:=optional, com.ibm.ws.Transaction;resolution:=optional, javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional, oracle.j2ee.transaction;resolution:=optional, oracle.sql;resolution:=optional, oracle.toplink.essentials.expressions;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional, org.jboss.resource.adapter.jdbc;resolution:=optional, org.eclipse.persistence.expressions;version="[1.0.0, 2.0.0)";resolution:=optional, weblogic.jdbc.extensions;resolution:=optional, weblogic.transaction;resolution:=optional Import-Template: bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, com.caucho.*;version="[3.1.5, 4.0.0)";resolution:=optional, com.ibatis.*;version="[2.3.0.677, 3.0.0)";resolution:=optional, com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, com.jamonapi.*;version="[2.4.0, 3.0.0)";resolution:=optional, com.lowagie.text.*;version="[2.0.8, 3.0.0)";resolution:=optional, commonj.*;version="[1.1.0, 2.0.0)";resolution:=optional, com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional, com.sun.enterprise.loader.*;version="[1.0.0, 2.0.0)";resolution:=optional, com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, freemarker.*;version="[2.3.12, 3.0.0)";resolution:=optional, groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, javax.annotation.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional, javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional, javax.jdo.*;version="[2.0.0, 3.0.0)";resolution:=optional, javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.portlet.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, javax.servlet.http;version="[2.4.0, 3.0.0)";resolution:=optional, javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)";resolution:=optional, javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)";resolution:=optional, javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, junit.framework.*;version="[3.8.2, 4.0.0)";resolution:=optional, jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, oracle.toplink.essentials.*;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional, oracle.toplink.exceptions;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.expressions;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.internal.databaseaccess;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.jndi;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.logging;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.publicinterface;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.queryframework;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.sessionbroker;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.sessions;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.threetier;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.tools.*;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.axis.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.catalina.*;version="[5.5.23, 7.0.0)";resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.beanutils.*;version="[1.7.0, 2.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.openjpa.persistence.*;version="[1.0.2, 2.0.0)";resolution:=optional, org.apache.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional, org.apache.struts.*;version="[1.2.9, 2.0.0)";resolution:=optional, org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional, org.apache.tiles;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.tiles.access;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.tiles.context;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.factory;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.locale.impl;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.preparer;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.servlet.context;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.web.util;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity.app.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity.context;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity.exception;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity.runtime.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.hibernate;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.cache;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.cfg;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.classic;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.connection;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.context;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.criterion;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.dialect;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.ejb;version="[3.3.0.ga, 4.0.0)";resolution:=optional, org.hibernate.engine;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.event.*;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.exception;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.impl;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.jdbc;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.persister.entity;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.transform;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.transaction;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.type;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional, org.junit.*;version="[4.4.0, 5.0.0)";resolution:=optional, org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional, org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional, org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional, *;resolution:=optional Unversioned-Imports: * Index: org.springframework.jms.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jms.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.jms.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.jms.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 5,9 **** Import-Template: javax.jms.*;version="[1.1.0, 2.0.0)", - javax.naming.*;resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, --- 5,8 ---- *************** *** 20,25 **** org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: ! javax.naming.*, ! org.w3c.dom.* --- 19,23 ---- org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * \ No newline at end of file Index: org.springframework.core.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.core.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.core.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.core.mf 28 Oct 2008 17:12:08 -0000 1.4 *************** *** 7,11 **** Import-Template: edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, - javax.xml.transform.*;resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, --- 7,10 ---- *************** *** 13,22 **** org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: ! javax.xml.transform.*, ! org.eclipse.core.runtime, ! org.w3c.dom.*, ! org.xml.sax.* --- 12,16 ---- org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! *;resolution:=optional Unversioned-Imports: ! * |
|
From: Costin L. <cos...@us...> - 2008-10-28 17:12:41
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16846 Modified Files: build.xml Log Message: + add manifest template for spring.jar Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.315 retrieving revision 1.316 diff -C2 -d -r1.315 -r1.316 *** build.xml 27 Oct 2008 14:04:15 -0000 1.315 --- build.xml 28 Oct 2008 17:12:08 -0000 1.316 *************** *** 754,757 **** --- 754,761 ---- manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.struts.mf"/> + <bundlor:bundlor bundlePath="${dist.dir}/spring.jar" outputPath="${dist.dir}/spring.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.mf"/> + </target> |
Update of /cvsroot/springframework/spring/maven In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19310/maven Modified Files: spring-aop.pom spring-context-support.pom spring-context.pom spring-test.pom spring-beans.pom spring-agent.pom spring-web.pom spring-tx.pom spring-webmvc-struts.pom spring-jdbc.pom spring-webmvc-portlet.pom spring.pom spring-webmvc.pom spring-orm.pom spring-core.pom spring-aspects.pom spring-jms.pom spring-tomcat-weaver.pom Log Message: + update OSGi templates + changed Maven version to 2.5.6-SNAPSHOT Index: spring-core.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-core.pom,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** spring-core.pom 27 Oct 2008 23:03:48 -0000 1.28 --- spring-core.pom 28 Oct 2008 13:04:32 -0000 1.29 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Core</name> ! <version>2.5.6</version> <description>Spring Framework: Core</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Core</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Core</description> <url>http://www.springframework.org</url> Index: spring-context-support.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-context-support.pom,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** spring-context-support.pom 27 Oct 2008 23:03:48 -0000 1.27 --- spring-context-support.pom 28 Oct 2008 13:04:32 -0000 1.28 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Context Support</name> ! <version>2.5.6</version> <description>Spring Framework: Context Support</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Context Support</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Context Support</description> <url>http://www.springframework.org</url> Index: spring-jdbc.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-jdbc.pom,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** spring-jdbc.pom 27 Oct 2008 23:03:48 -0000 1.30 --- spring-jdbc.pom 28 Oct 2008 13:04:32 -0000 1.31 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: JDBC</name> ! <version>2.5.6</version> <description>Spring Framework: JDBC</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: JDBC</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: JDBC</description> <url>http://www.springframework.org</url> Index: spring-web.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-web.pom,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** spring-web.pom 27 Oct 2008 23:03:48 -0000 1.32 --- spring-web.pom 28 Oct 2008 13:04:32 -0000 1.33 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web</name> ! <version>2.5.6</version> <description>Spring Framework: Web</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web</description> <url>http://www.springframework.org</url> Index: spring-tx.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-tx.pom,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** spring-tx.pom 27 Oct 2008 23:03:48 -0000 1.22 --- spring-tx.pom 28 Oct 2008 13:04:32 -0000 1.23 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Transaction</name> ! <version>2.5.6</version> <description>Spring Framework: Transaction</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Transaction</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Transaction</description> <url>http://www.springframework.org</url> Index: spring.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring.pom,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** spring.pom 27 Oct 2008 23:03:48 -0000 1.43 --- spring.pom 28 Oct 2008 13:04:32 -0000 1.44 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework</name> ! <version>2.5.6</version> <description>Spring Framework</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework</description> <url>http://www.springframework.org</url> Index: spring-agent.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-agent.pom,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** spring-agent.pom 27 Oct 2008 23:03:48 -0000 1.25 --- spring-agent.pom 28 Oct 2008 13:04:32 -0000 1.26 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Agent</name> ! <version>2.5.6</version> <description>Spring Framework: Agent</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Agent</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Agent</description> <url>http://www.springframework.org</url> Index: spring-jms.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-jms.pom,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spring-jms.pom 27 Oct 2008 23:03:48 -0000 1.26 --- spring-jms.pom 28 Oct 2008 13:04:32 -0000 1.27 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: JMS</name> ! <version>2.5.6</version> <description>Spring Framework: JMS</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: JMS</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: JMS</description> <url>http://www.springframework.org</url> Index: spring-orm.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-orm.pom,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** spring-orm.pom 27 Oct 2008 23:03:48 -0000 1.25 --- spring-orm.pom 28 Oct 2008 13:04:32 -0000 1.26 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: ORM</name> ! <version>2.5.6</version> <description>Spring Framework: ORM</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: ORM</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: ORM</description> <url>http://www.springframework.org</url> Index: spring-context.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-context.pom,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** spring-context.pom 27 Oct 2008 23:03:48 -0000 1.29 --- spring-context.pom 28 Oct 2008 13:04:32 -0000 1.30 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Context</name> ! <version>2.5.6</version> <description>Spring Framework: Context</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Context</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Context</description> <url>http://www.springframework.org</url> Index: spring-beans.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-beans.pom,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spring-beans.pom 27 Oct 2008 23:03:48 -0000 1.26 --- spring-beans.pom 28 Oct 2008 13:04:32 -0000 1.27 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Beans</name> ! <version>2.5.6</version> <description>Spring Framework: Beans</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Beans</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Beans</description> <url>http://www.springframework.org</url> Index: spring-aop.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-aop.pom,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** spring-aop.pom 27 Oct 2008 23:03:48 -0000 1.31 --- spring-aop.pom 28 Oct 2008 13:04:32 -0000 1.32 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: AOP</name> ! <version>2.5.6</version> <description>Spring Framework: AOP</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: AOP</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: AOP</description> <url>http://www.springframework.org</url> Index: spring-webmvc.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc.pom,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** spring-webmvc.pom 27 Oct 2008 23:03:48 -0000 1.34 --- spring-webmvc.pom 28 Oct 2008 13:04:32 -0000 1.35 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC</description> <url>http://www.springframework.org</url> Index: spring-webmvc-struts.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc-struts.pom,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** spring-webmvc-struts.pom 27 Oct 2008 23:03:48 -0000 1.22 --- spring-webmvc-struts.pom 28 Oct 2008 13:04:32 -0000 1.23 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC Struts</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC Struts</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC Struts</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC Struts</description> <url>http://www.springframework.org</url> Index: spring-tomcat-weaver.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-tomcat-weaver.pom,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** spring-tomcat-weaver.pom 27 Oct 2008 23:03:48 -0000 1.25 --- spring-tomcat-weaver.pom 28 Oct 2008 13:04:32 -0000 1.26 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Tomcat Weaver</name> ! <version>2.5.6</version> <description>Spring Framework: Tomcat Weaver</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Tomcat Weaver</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Tomcat Weaver</description> <url>http://www.springframework.org</url> Index: spring-test.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-test.pom,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** spring-test.pom 27 Oct 2008 23:03:48 -0000 1.21 --- spring-test.pom 28 Oct 2008 13:04:32 -0000 1.22 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Test</name> ! <version>2.5.6</version> <description>Spring Framework: Test</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Test</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Test</description> <url>http://www.springframework.org</url> Index: spring-webmvc-portlet.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc-portlet.pom,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** spring-webmvc-portlet.pom 27 Oct 2008 23:03:48 -0000 1.21 --- spring-webmvc-portlet.pom 28 Oct 2008 13:04:32 -0000 1.22 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC Portlet</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC Portlet</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC Portlet</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC Portlet</description> <url>http://www.springframework.org</url> Index: spring-aspects.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-aspects.pom,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** spring-aspects.pom 27 Oct 2008 23:03:48 -0000 1.29 --- spring-aspects.pom 28 Oct 2008 13:04:32 -0000 1.30 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Aspects</name> ! <version>2.5.6</version> <description>Spring Framework: Aspects</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Aspects</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Aspects</description> <url>http://www.springframework.org</url> |
|
From: Juergen H. <jho...@us...> - 2008-10-28 13:30:47
|
Update of /cvsroot/springframework/spring/src/org/springframework/beans/factory/config In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21366/src/org/springframework/beans/factory/config Modified Files: ConfigurableBeanFactory.java Log Message: clarified addBeanPostProcessor semantics Index: ConfigurableBeanFactory.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/factory/config/ConfigurableBeanFactory.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** ConfigurableBeanFactory.java 13 Oct 2008 15:51:16 -0000 1.50 --- ConfigurableBeanFactory.java 28 Oct 2008 13:30:38 -0000 1.51 *************** *** 186,190 **** * Add a new BeanPostProcessor that will get applied to beans created * by this factory. To be invoked during factory configuration. ! * @param beanPostProcessor the bean processor to register */ void addBeanPostProcessor(BeanPostProcessor beanPostProcessor); --- 186,195 ---- * Add a new BeanPostProcessor that will get applied to beans created * by this factory. To be invoked during factory configuration. ! * <p>Note: Post-processors submitted here will be applied in the order of ! * registration; any ordering semantics expressed through implementing the ! * {@link org.springframework.core.Ordered} interface will be ignored. Note ! * that autodetected post-processors (e.g. as beans in an ApplicationContext) ! * will always be applied after programmatically registered ones. ! * @param beanPostProcessor the post-processor to register */ void addBeanPostProcessor(BeanPostProcessor beanPostProcessor); |
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19310/osgi/bundlor Modified Files: org.springframework.beans.mf org.springframework.web.mf org.springframework.aspects.mf org.springframework.instrument.classloading.mf org.springframework.jms.mf org.springframework.context.support.mf org.springframework.transaction.mf org.springframework.context.mf org.springframework.web.servlet.mf org.springframework.aop.mf org.springframework.jdbc.mf org.springframework.test.mf org.springframework.web.portlet.mf org.springframework.web.struts.mf org.springframework.orm.mf org.springframework.core.mf Log Message: + update OSGi templates + changed Maven version to 2.5.6-SNAPSHOT Index: org.springframework.web.struts.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.struts.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.web.struts.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.web.struts.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 6,10 **** javax.servlet.*;version="[2.4.0, 3.0.0)", org.apache.commons.beanutils.*;version="[1.7.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.struts.*;version="[1.2.9, 2.0.0)", org.springframework.beans.*;version="[2.5.6, 2.5.6]", --- 6,10 ---- javax.servlet.*;version="[2.4.0, 3.0.0)", org.apache.commons.beanutils.*;version="[1.7.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.struts.*;version="[1.2.9, 2.0.0)", org.springframework.beans.*;version="[2.5.6, 2.5.6]", Index: org.springframework.test.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.test.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.test.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.test.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- Import-Template: javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, + javax.naming.*;resolution:=optional, javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.portlet.*;version="[1.0.0, 2.0.0)";resolution:=optional, *************** *** 10,15 **** javax.servlet.http;version="[2.4.0, 3.0.0)";resolution:=optional, javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, junit.framework.*;version="[3.8.2, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional, org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, --- 11,17 ---- javax.servlet.http;version="[2.4.0, 3.0.0)";resolution:=optional, javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, + javax.sql;resolution:=optional, junit.framework.*;version="[3.8.2, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional, org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, Index: org.springframework.orm.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.orm.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.orm.mf 24 Oct 2008 09:47:45 -0000 1.3 --- org.springframework.orm.mf 28 Oct 2008 13:04:32 -0000 1.4 *************** *** 12,16 **** --- 12,19 ---- javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, + javax.sql.*;resolution:=optional, + javax.naming.*;resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, + javax.xml.parsers.*;resolution:=optional, oracle.toplink.essentials.*;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional, oracle.toplink.exceptions;version="[10.1.3, 11.0.0)";resolution:=optional, *************** *** 25,30 **** oracle.toplink.threetier;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.tools.*;version="[10.1.3, 11.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.openjpa.persistence.*;version="[1.0.2, 2.0.0)";resolution:=optional, org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, --- 28,33 ---- oracle.toplink.threetier;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.tools.*;version="[10.1.3, 11.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.openjpa.persistence.*;version="[1.0.2, 2.0.0)";resolution:=optional, org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, *************** *** 50,65 **** org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.dao.*;version="[2.5.6, 2.5.6]", org.springframework.instrument.classloading.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jdbc.*;version="[2.5.6, 2.5.6]", org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]", org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional Unversioned-Imports: javax.naming.*, --- 53,70 ---- org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.dao.*;version="[2.5.6, 2.5.6]", org.springframework.instrument.classloading.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jdbc.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax;resolution:=optional Unversioned-Imports: javax.naming.*, Index: org.springframework.aop.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aop.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.aop.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.aop.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,16 **** Import-Template: com.jamonapi.*;version="[2.4.0, 3.0.0)";resolution:=optional, ! net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: ! org.w3c.dom.* --- 5,17 ---- Import-Template: com.jamonapi.*;version="[2.4.0, 3.0.0)";resolution:=optional, ! net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: ! org.w3c.dom.* \ No newline at end of file Index: org.springframework.web.portlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.portlet.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.web.portlet.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.web.portlet.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 7,19 **** javax.servlet.*;version="[2.4.0, 3.0.0)", org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", ! org.springframework.stereotype;version="[2.5.6, 2.5.6]", ! org.springframework.ui.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]", ! org.springframework.validation.*;version="[2.5.6, 2.5.6]", ! org.springframework.web.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: org.xml.sax.* --- 7,20 ---- javax.servlet.*;version="[2.4.0, 3.0.0)", org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: org.xml.sax.* Index: org.springframework.aspects.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aspects.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.aspects.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.aspects.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 4,9 **** Bundle-ManifestVersion: 2 Import-Template: ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional --- 4,9 ---- Bundle-ManifestVersion: 2 Import-Template: ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional Index: org.springframework.transaction.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.transaction.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.transaction.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.transaction.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 4,26 **** Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.6, 2.5.6]" Import-Template: com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, ! javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]", org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.management.*, javax.naming.*, ! org.w3c.dom.* --- 4,37 ---- Bundle-ManifestVersion: 2 Import-Package: ! com.evermind.server;resolution:=optional, ! com.ibm.ws.Transaction;resolution:=optional, ! oracle.j2ee.transaction;resolution:=optional, ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, ! weblogic.transaction;resolution:=optional Import-Template: com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, ! javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, ! javax.management.*;resolution:=optional, ! javax.naming.*;resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: + com.evermind.server, + com.ibm.ws.Transaction, javax.management.*, javax.naming.*, ! oracle.j2ee.transaction, ! org.w3c.dom.*, ! weblogic.transaction Index: org.springframework.jdbc.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jdbc.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.jdbc.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.jdbc.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 3,22 **** Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional, com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.dao.*;version="[2.5.6, 2.5.6]", org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]", ! org.springframework.util;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.naming.*, javax.sql, javax.xml.transform.*, org.w3c.dom.* --- 3,37 ---- Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 + Import-Package: + oracle.sql;resolution:=optional, + org.jboss.resource.adapter.jdbc;resolution:=optional, + weblogic.jdbc.extensions;resolution:=optional, + com.ibm.websphere.rsadapter;resolution:=optional, + com.ibm.ws.rsadapter.jdbc;resolution:=optional Import-Template: com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional, com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, + javax.naming.*;resolution:=optional, + javax.sql;resolution:=optional, javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, ! javax.xml.transform.*;resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.dao.*;version="[2.5.6, 2.5.6]", org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: javax.naming.*, javax.sql, javax.xml.transform.*, + oracle.sql, + org.jboss.resource.adapter.jdbc, + weblogic.jdbc.extensions, + com.ibm.websphere.rsadapter, + com.ibm.ws.rsadapter.jdbc, org.w3c.dom.* Index: org.springframework.web.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.web.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.web.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 12,31 **** javax.servlet.http;version="[2.4.0, 3.0.0)", javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", org.apache.axis.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.taglibs.*;version="[1.1.2, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.remoting.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: com.sun.net.*, --- 12,33 ---- javax.servlet.http;version="[2.4.0, 3.0.0)", javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, + javax.xml.namespace.*;resolution:=optional, javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.axis.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.taglibs.*;version="[1.1.2, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.remoting.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: com.sun.net.*, Index: org.springframework.instrument.classloading.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.instrument.classloading.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.instrument.classloading.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.instrument.classloading.mf 28 Oct 2008 13:04:32 -0000 1.2 *************** *** 4,6 **** Bundle-ManifestVersion: 2 Import-Template: ! org.apache.catalina.*;version="[6.0.16, 7.0.0)" --- 4,6 ---- Bundle-ManifestVersion: 2 Import-Template: ! org.apache.catalina.*;version="[5.5.23, 7.0.0)" Index: org.springframework.context.support.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.support.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.context.support.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.context.support.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 7,25 **** freemarker.*;version="[2.3.12, 3.0.0)";resolution:=optional, javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional, org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional, org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.jdbc.datasource.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.naming.*, --- 7,27 ---- freemarker.*;version="[2.3.12, 3.0.0)";resolution:=optional, javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, + javax.naming.*;resolution:=optional, javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, + javax.sql.*;resolution:=optional, net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional, org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jdbc.datasource.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional Unversioned-Imports: javax.naming.*, Index: org.springframework.web.servlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.servlet.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.web.servlet.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.web.servlet.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 4,8 **** Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.6, 2.5.6]", org.apache.tiles.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional --- 4,8 ---- Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, org.apache.tiles.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional *************** *** 12,23 **** javax.servlet;version="[2.4.0, 3.0.0)", javax.servlet.http;version="[2.4.0, 3.0.0)", ! javax.servlet.jsp;version="[2.1.0, 3.0.0)", ! javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)", ! javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)", jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional, org.apache.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional, org.apache.tiles;version="[2.0.5, 3.0.0)";resolution:=optional, --- 12,25 ---- javax.servlet;version="[2.4.0, 3.0.0)", javax.servlet.http;version="[2.4.0, 3.0.0)", ! javax.servlet.jsp;version="[2.1.0, 3.0.0)";resolution:=optional, ! javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)";resolution:=optional, ! javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)";resolution:=optional, ! javax.sql.*;resolution:=optional, ! javax.xml.transform.*;resolution:=optional, jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional, org.apache.tiles;version="[2.0.5, 3.0.0)";resolution:=optional, *************** *** 36,46 **** org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", ! org.springframework.ui.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]", ! org.springframework.validation.*;version="[2.5.6, 2.5.6]", ! org.springframework.web.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.sql.*, --- 38,50 ---- org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: javax.sql.*, Index: org.springframework.beans.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.beans.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.beans.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.beans.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,12 **** Import-Template: javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]", Unversioned-Imports: javax.xml.parsers.*, --- 5,15 ---- Import-Template: javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, + javax.xml.parsers.*;resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: javax.xml.parsers.*, Index: org.springframework.context.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.context.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.context.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,9 **** Import-Package: javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.springframework.orm.jpa.support;version="[2.5.6, 2.5.6]";resolution:=optional Import-Template: bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, --- 5,10 ---- Import-Package: javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.springframework.orm.jpa.support;version="[2.5.6, 2.5.6]";resolution:=optional, ! com.ibm.websphere.management;resolution:=optional Import-Template: bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, *************** *** 17,35 **** javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, ! net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional, oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.instrument.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: com.sun.net.*, javax.management.*, --- 18,45 ---- javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional, + javax.management.*;resolution:=optional, + javax.naming.*;resolution:=optional, + javax.rmi.*;resolution:=optional, + javax.xml.namespace.*;resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, ! net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.instrument.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.omg.CORBA.*;resolution:=optional, ! org.omg.CORBA_2_3.*;resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: + com.ibm.websphere.management, com.sun.net.*, javax.management.*, *************** *** 40,42 **** org.omg.CORBA_2_3.*, org.w3c.dom.*, ! org.xml.sax.* --- 50,52 ---- org.omg.CORBA_2_3.*, org.w3c.dom.*, ! org.xml.sax.* \ No newline at end of file Index: org.springframework.jms.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jms.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.jms.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.jms.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,16 **** Import-Template: javax.jms.*;version="[1.1.0, 2.0.0)", javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.jca.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, --- 5,17 ---- Import-Template: javax.jms.*;version="[1.1.0, 2.0.0)", + javax.naming.*;resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging;version="[1.0.4, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jca.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, *************** *** 18,22 **** org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.naming.*, --- 19,24 ---- org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: javax.naming.*, Index: org.springframework.core.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.core.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.core.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.core.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 3,15 **** Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, ! org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional Unversioned-Imports: javax.xml.transform.*, org.w3c.dom.*, org.xml.sax.* --- 3,22 ---- Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 + Import-Package: + org.eclipse.core.runtime;common="split";resolution:=optional Import-Template: edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, + javax.xml.transform.*;resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, ! org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: javax.xml.transform.*, + org.eclipse.core.runtime, org.w3c.dom.*, org.xml.sax.* |
|
From: Juergen H. <jho...@us...> - 2008-10-28 00:08:32
|
Update of /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32677/tiger/test/org/springframework/orm/jpa/hibernate Modified Files: hibernate-manager.xml Log Message: commented out configurer aspect test's configuration as well Index: hibernate-manager.xml =================================================================== RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate/hibernate-manager.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** hibernate-manager.xml 21 Oct 2008 22:40:00 -0000 1.12 --- hibernate-manager.xml 28 Oct 2008 00:08:21 -0000 1.13 *************** *** 11,15 **** <context:annotation-config/> ! <context:spring-configured/> <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" --- 11,15 ---- <context:annotation-config/> ! <!-- <context:spring-configured/> TODO --> <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" |
Update of /cvsroot/springframework/spring/maven In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29085/maven Modified Files: spring-aspects.pom spring-tomcat-weaver.pom spring-core.pom spring-test.pom spring-aop.pom spring-context.pom spring.pom spring-web.pom spring-context-support.pom spring-webmvc-portlet.pom spring-agent.pom spring-jms.pom spring-orm.pom spring-tx.pom spring-beans.pom spring-webmvc-struts.pom spring-webmvc.pom spring-jdbc.pom Log Message: prepared for 2.5.6 release Index: spring-core.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-core.pom,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** spring-core.pom 2 Jul 2008 14:16:38 -0000 1.27 --- spring-core.pom 27 Oct 2008 23:03:48 -0000 1.28 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Core</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Core</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Core</name> ! <version>2.5.6</version> <description>Spring Framework: Core</description> <url>http://www.springframework.org</url> Index: spring.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring.pom,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** spring.pom 30 Sep 2008 11:32:23 -0000 1.42 --- spring.pom 27 Oct 2008 23:03:48 -0000 1.43 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework</name> ! <version>2.5.6</version> <description>Spring Framework</description> <url>http://www.springframework.org</url> Index: spring-web.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-web.pom,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** spring-web.pom 30 Sep 2008 11:32:23 -0000 1.31 --- spring-web.pom 27 Oct 2008 23:03:48 -0000 1.32 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web</name> ! <version>2.5.6</version> <description>Spring Framework: Web</description> <url>http://www.springframework.org</url> Index: spring-jdbc.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-jdbc.pom,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** spring-jdbc.pom 2 Jul 2008 14:16:38 -0000 1.29 --- spring-jdbc.pom 27 Oct 2008 23:03:48 -0000 1.30 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: JDBC</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: JDBC</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: JDBC</name> ! <version>2.5.6</version> <description>Spring Framework: JDBC</description> <url>http://www.springframework.org</url> Index: spring-tx.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-tx.pom,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** spring-tx.pom 2 Jul 2008 14:16:38 -0000 1.21 --- spring-tx.pom 27 Oct 2008 23:03:48 -0000 1.22 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Transaction</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Transaction</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Transaction</name> ! <version>2.5.6</version> <description>Spring Framework: Transaction</description> <url>http://www.springframework.org</url> Index: spring-context-support.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-context-support.pom,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spring-context-support.pom 30 Sep 2008 11:32:23 -0000 1.26 --- spring-context-support.pom 27 Oct 2008 23:03:48 -0000 1.27 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Context Support</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Context Support</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Context Support</name> ! <version>2.5.6</version> <description>Spring Framework: Context Support</description> <url>http://www.springframework.org</url> Index: spring-jms.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-jms.pom,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** spring-jms.pom 2 Jul 2008 14:16:38 -0000 1.25 --- spring-jms.pom 27 Oct 2008 23:03:48 -0000 1.26 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: JMS</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: JMS</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: JMS</name> ! <version>2.5.6</version> <description>Spring Framework: JMS</description> <url>http://www.springframework.org</url> Index: spring-orm.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-orm.pom,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** spring-orm.pom 30 Sep 2008 11:32:23 -0000 1.24 --- spring-orm.pom 27 Oct 2008 23:03:48 -0000 1.25 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: ORM</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: ORM</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: ORM</name> ! <version>2.5.6</version> <description>Spring Framework: ORM</description> <url>http://www.springframework.org</url> Index: spring-context.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-context.pom,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** spring-context.pom 2 Jul 2008 14:16:38 -0000 1.28 --- spring-context.pom 27 Oct 2008 23:03:48 -0000 1.29 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Context</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Context</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Context</name> ! <version>2.5.6</version> <description>Spring Framework: Context</description> <url>http://www.springframework.org</url> Index: spring-aspects.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-aspects.pom,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** spring-aspects.pom 7 Jul 2008 14:29:44 -0000 1.28 --- spring-aspects.pom 27 Oct 2008 23:03:48 -0000 1.29 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Aspects</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Aspects</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Aspects</name> ! <version>2.5.6</version> <description>Spring Framework: Aspects</description> <url>http://www.springframework.org</url> Index: spring-beans.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-beans.pom,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** spring-beans.pom 2 Jul 2008 14:16:38 -0000 1.25 --- spring-beans.pom 27 Oct 2008 23:03:48 -0000 1.26 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Beans</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Beans</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Beans</name> ! <version>2.5.6</version> <description>Spring Framework: Beans</description> <url>http://www.springframework.org</url> Index: spring-aop.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-aop.pom,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** spring-aop.pom 7 Jul 2008 14:29:44 -0000 1.30 --- spring-aop.pom 27 Oct 2008 23:03:48 -0000 1.31 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: AOP</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: AOP</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: AOP</name> ! <version>2.5.6</version> <description>Spring Framework: AOP</description> <url>http://www.springframework.org</url> Index: spring-webmvc.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc.pom,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** spring-webmvc.pom 30 Sep 2008 11:32:23 -0000 1.33 --- spring-webmvc.pom 27 Oct 2008 23:03:48 -0000 1.34 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC</description> <url>http://www.springframework.org</url> Index: spring-webmvc-struts.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc-struts.pom,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** spring-webmvc-struts.pom 30 Sep 2008 11:32:23 -0000 1.21 --- spring-webmvc-struts.pom 27 Oct 2008 23:03:48 -0000 1.22 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC Struts</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC Struts</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC Struts</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC Struts</description> <url>http://www.springframework.org</url> Index: spring-tomcat-weaver.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-tomcat-weaver.pom,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** spring-tomcat-weaver.pom 2 Jul 2008 14:16:38 -0000 1.24 --- spring-tomcat-weaver.pom 27 Oct 2008 23:03:48 -0000 1.25 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Tomcat Weaver</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Tomcat Weaver</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Tomcat Weaver</name> ! <version>2.5.6</version> <description>Spring Framework: Tomcat Weaver</description> <url>http://www.springframework.org</url> Index: spring-test.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-test.pom,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** spring-test.pom 7 Jul 2008 14:29:44 -0000 1.20 --- spring-test.pom 27 Oct 2008 23:03:48 -0000 1.21 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Test</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Test</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Test</name> ! <version>2.5.6</version> <description>Spring Framework: Test</description> <url>http://www.springframework.org</url> Index: spring-webmvc-portlet.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-webmvc-portlet.pom,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** spring-webmvc-portlet.pom 2 Jul 2008 14:16:38 -0000 1.20 --- spring-webmvc-portlet.pom 27 Oct 2008 23:03:48 -0000 1.21 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Web MVC Portlet</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Web MVC Portlet</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Web MVC Portlet</name> ! <version>2.5.6</version> <description>Spring Framework: Web MVC Portlet</description> <url>http://www.springframework.org</url> Index: spring-agent.pom =================================================================== RCS file: /cvsroot/springframework/spring/maven/spring-agent.pom,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** spring-agent.pom 2 Jul 2008 14:16:38 -0000 1.24 --- spring-agent.pom 27 Oct 2008 23:03:48 -0000 1.25 *************** *** 10,14 **** <packaging>jar</packaging> <name>Spring Framework: Agent</name> ! <version>2.5.6-SNAPSHOT</version> <description>Spring Framework: Agent</description> <url>http://www.springframework.org</url> --- 10,14 ---- <packaging>jar</packaging> <name>Spring Framework: Agent</name> ! <version>2.5.6</version> <description>Spring Framework: Agent</description> <url>http://www.springframework.org</url> |
|
From: Juergen H. <jho...@us...> - 2008-10-27 23:02:06
|
Update of /cvsroot/springframework/spring/tiger/src/org/springframework/validation/support In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29021/tiger/src/org/springframework/validation/support Modified Files: BindingAwareModelMap.java Log Message: fixed javadoc Index: BindingAwareModelMap.java =================================================================== RCS file: /cvsroot/springframework/spring/tiger/src/org/springframework/validation/support/BindingAwareModelMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BindingAwareModelMap.java 30 Sep 2008 11:28:22 -0000 1.1 --- BindingAwareModelMap.java 27 Oct 2008 23:01:55 -0000 1.2 *************** *** 33,37 **** * @author Juergen Hoeller * @since 2.5.6 ! * @see */ public class BindingAwareModelMap extends ExtendedModelMap { --- 33,37 ---- * @author Juergen Hoeller * @since 2.5.6 ! * @see org.springframework.validation.BindingResult */ public class BindingAwareModelMap extends ExtendedModelMap { |
|
From: Juergen H. <jho...@us...> - 2008-10-27 21:06:56
|
Update of /cvsroot/springframework/spring/src/org/springframework/beans/factory/xml In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14943/src/org/springframework/beans/factory/xml Modified Files: BeanDefinitionParserDelegate.java Log Message: polishing Index: BeanDefinitionParserDelegate.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** BeanDefinitionParserDelegate.java 21 Oct 2008 10:35:49 -0000 1.59 --- BeanDefinitionParserDelegate.java 27 Oct 2008 21:06:44 -0000 1.60 *************** *** 67,75 **** /** ! * Stateful delegate class used to parse XML bean definitions. Intended for use ! * by both the main parser and any extension * {@link BeanDefinitionParser BeanDefinitionParsers} or * {@link BeanDefinitionDecorator BeanDefinitionDecorators}. ! * * @author Rob Harrop * @author Juergen Hoeller --- 67,75 ---- /** ! * Stateful delegate class used to parse XML bean definitions. ! * Intended for use by both the main parser and any extension * {@link BeanDefinitionParser BeanDefinitionParsers} or * {@link BeanDefinitionDecorator BeanDefinitionDecorators}. ! * * @author Rob Harrop * @author Juergen Hoeller *************** *** 87,92 **** /** ! * Value of a T/F attribute that represents true. Anything else represents ! * false. Case seNsItive. */ public static final String TRUE_VALUE = "true"; --- 87,92 ---- /** ! * Value of a T/F attribute that represents true. ! * Anything else represents false. Case seNsItive. */ public static final String TRUE_VALUE = "true"; *************** *** 228,231 **** --- 228,232 ---- public static final String DEFAULT_DESTROY_METHOD_ATTRIBUTE = "default-destroy-method"; + protected final Log logger = LogFactory.getLog(getClass()); *************** *** 237,242 **** /** ! * Stores all used bean names so we can enforce uniqueness on a per file ! * basis. */ private final Set usedNames = new HashSet(); --- 238,242 ---- /** ! * Stores all used bean names so we can enforce uniqueness on a per file basis. */ private final Set usedNames = new HashSet(); *************** *** 244,249 **** /** ! * Create a new BeanDefinitionParserDelegate associated with the supplied ! * {@link XmlReaderContext}. */ public BeanDefinitionParserDelegate(XmlReaderContext readerContext) { --- 244,249 ---- /** ! * Create a new BeanDefinitionParserDelegate associated with the ! * supplied {@link XmlReaderContext}. */ public BeanDefinitionParserDelegate(XmlReaderContext readerContext) { *************** *** 259,266 **** } /** ! * Invoke the ! * {@link org.springframework.beans.factory.parsing.SourceExtractor} to pull ! * the source metadata from the supplied {@link Element}. */ protected Object extractSource(Element ele) { --- 259,266 ---- } + /** ! * Invoke the {@link org.springframework.beans.factory.parsing.SourceExtractor} to pull the ! * source metadata from the supplied {@link Element}. */ protected Object extractSource(Element ele) { *************** *** 289,296 **** } /** * Initialize the default lazy-init, autowire, dependency check settings, * init-method, destroy-method and merge settings. - * * @see #getDefaults() */ --- 289,296 ---- } + /** * Initialize the default lazy-init, autowire, dependency check settings, * init-method, destroy-method and merge settings. * @see #getDefaults() */ *************** *** 325,330 **** /** ! * Return the default settings for bean definitions as indicated within the ! * attributes of the top-level <code><beans/></code> element. */ public BeanDefinitionDefaults getBeanDefinitionDefaults() { --- 325,330 ---- /** ! * Return the default settings for bean definitions as indicated within ! * the attributes of the top-level <code><beans/></code> element. */ public BeanDefinitionDefaults getBeanDefinitionDefaults() { *************** *** 349,356 **** } /** ! * Parses the supplied <code><bean></code> element. May return ! * <code>null</code> if there were errors during parse. Errors are ! * reported to the * {@link org.springframework.beans.factory.parsing.ProblemReporter}. */ --- 349,356 ---- } + /** ! * Parses the supplied <code><bean></code> element. May return <code>null</code> ! * if there were errors during parse. Errors are reported to the * {@link org.springframework.beans.factory.parsing.ProblemReporter}. */ *************** *** 360,366 **** /** ! * Parses the supplied <code><bean></code> element. May return ! * <code>null</code> if there were errors during parse. Errors are ! * reported to the * {@link org.springframework.beans.factory.parsing.ProblemReporter}. */ --- 360,365 ---- /** ! * Parses the supplied <code><bean></code> element. May return <code>null</code> ! * if there were errors during parse. Errors are reported to the * {@link org.springframework.beans.factory.parsing.ProblemReporter}. */ *************** *** 379,384 **** beanName = (String) aliases.remove(0); if (logger.isDebugEnabled()) { ! logger.debug("No XML 'id' specified - using '" + beanName + "' as bean name and " + aliases ! + " as aliases"); } } --- 378,383 ---- beanName = (String) aliases.remove(0); if (logger.isDebugEnabled()) { ! logger.debug("No XML 'id' specified - using '" + beanName + ! "' as bean name and " + aliases + " as aliases"); } } *************** *** 393,398 **** try { if (containingBean != null) { ! beanName = BeanDefinitionReaderUtils.generateBeanName(beanDefinition, ! this.readerContext.getRegistry(), true); } else { --- 392,397 ---- try { if (containingBean != null) { ! beanName = BeanDefinitionReaderUtils.generateBeanName( ! beanDefinition, this.readerContext.getRegistry(), true); } else { *************** *** 402,414 **** // This is expected for Spring 1.2/2.0 backwards compatibility. String beanClassName = beanDefinition.getBeanClassName(); ! if (beanClassName != null && beanName.startsWith(beanClassName) ! && beanName.length() > beanClassName.length() ! && !this.readerContext.getRegistry().isBeanNameInUse(beanClassName)) { aliases.add(beanClassName); } } if (logger.isDebugEnabled()) { ! logger.debug("Neither XML 'id' nor 'name' specified - " + "using generated bean name [" ! + beanName + "]"); } } --- 401,413 ---- // This is expected for Spring 1.2/2.0 backwards compatibility. String beanClassName = beanDefinition.getBeanClassName(); ! if (beanClassName != null && ! beanName.startsWith(beanClassName) && beanName.length() > beanClassName.length() && ! !this.readerContext.getRegistry().isBeanNameInUse(beanClassName)) { aliases.add(beanClassName); } } if (logger.isDebugEnabled()) { ! logger.debug("Neither XML 'id' nor 'name' specified - " + ! "using generated bean name [" + beanName + "]"); } } *************** *** 426,431 **** /** ! * Validate that the specified bean name and aliases have not been used ! * already. */ protected void checkNameUniqueness(String beanName, List aliases, Element beanElement) { --- 425,429 ---- /** ! * Validate that the specified bean name and aliases have not been used already. */ protected void checkNameUniqueness(String beanName, List aliases, Element beanElement) { *************** *** 447,455 **** /** ! * Parse the bean definition itself, without regard to name or aliases. May ! * return <code>null</code> if problems occured during the parse of the ! * bean definition. */ ! public AbstractBeanDefinition parseBeanDefinitionElement(Element ele, String beanName, BeanDefinition containingBean) { this.parseState.push(new BeanEntry(beanName)); --- 445,453 ---- /** ! * Parse the bean definition itself, without regard to name or aliases. May return ! * <code>null</code> if problems occured during the parse of the bean definition. */ ! public AbstractBeanDefinition parseBeanDefinitionElement( ! Element ele, String beanName, BeanDefinition containingBean) { this.parseState.push(new BeanEntry(beanName)); *************** *** 468,472 **** parseBeanDefinitionAttributes(ele, beanName, containingBean, bd); - bd.setDescription(DomUtils.getChildElementValueByTagName(ele, DESCRIPTION_ELEMENT)); --- 466,469 ---- *************** *** 501,512 **** /** ! * Apply the attributes of the given bean element to the given bean ! * definition. ! * * @param ele bean declaration element * @param beanName bean name * @param containingBean containing bean definition ! * @return a bean definition initialized according to the bean element ! * attributes */ public AbstractBeanDefinition parseBeanDefinitionAttributes(Element ele, String beanName, --- 498,506 ---- /** ! * Apply the attributes of the given bean element to the given bean * definition. * @param ele bean declaration element * @param beanName bean name * @param containingBean containing bean definition ! * @return a bean definition initialized according to the bean element attributes */ public AbstractBeanDefinition parseBeanDefinitionAttributes(Element ele, String beanName, *************** *** 606,621 **** /** * Create a bean definition for the given class name and parent name. - * * @param className the name of the bean class * @param parentName the name of the bean's parent bean * @return the newly created bean definition ! * @throws ClassNotFoundException if bean class resolution was attempted but ! * failed */ protected AbstractBeanDefinition createBeanDefinition(String className, String parentName) throws ClassNotFoundException { ! return BeanDefinitionReaderUtils.createBeanDefinition(parentName, className, ! this.readerContext.getBeanClassLoader()); } --- 600,613 ---- /** * Create a bean definition for the given class name and parent name. * @param className the name of the bean class * @param parentName the name of the bean's parent bean * @return the newly created bean definition ! * @throws ClassNotFoundException if bean class resolution was attempted but failed */ protected AbstractBeanDefinition createBeanDefinition(String className, String parentName) throws ClassNotFoundException { ! return BeanDefinitionReaderUtils.createBeanDefinition( ! parentName, className, this.readerContext.getBeanClassLoader()); } *************** *** 773,778 **** this.parseState.push(new ConstructorArgumentEntry(index)); Object value = parsePropertyValue(ele, bd, null); ! ConstructorArgumentValues.ValueHolder valueHolder = new ConstructorArgumentValues.ValueHolder( ! value); if (StringUtils.hasLength(typeAttr)) { valueHolder.setType(typeAttr); --- 765,769 ---- this.parseState.push(new ConstructorArgumentEntry(index)); Object value = parsePropertyValue(ele, bd, null); ! ConstructorArgumentValues.ValueHolder valueHolder = new ConstructorArgumentValues.ValueHolder(value); if (StringUtils.hasLength(typeAttr)) { valueHolder.setType(typeAttr); *************** *** 876,885 **** /** ! * Get the value of a property element. May be a list etc. Also used for ! * constructor arguments, "propertyName" being null in this case. */ public Object parsePropertyValue(Element ele, BeanDefinition bd, String propertyName) { ! String elementName = (propertyName != null) ? "<property> element for property '" + propertyName + "'" ! : "<constructor-arg> element"; // Should only have one child element: ref, value, list, etc. --- 867,877 ---- /** ! * Get the value of a property element. May be a list etc. ! * Also used for constructor arguments, "propertyName" being null in this case. */ public Object parsePropertyValue(Element ele, BeanDefinition bd, String propertyName) { ! String elementName = (propertyName != null) ? ! "<property> element for property '" + propertyName + "'" : ! "<constructor-arg> element"; // Should only have one child element: ref, value, list, etc. *************** *** 888,893 **** for (int i = 0; i < nl.getLength(); i++) { Node node = nl.item(i); ! if (node instanceof Element && !DomUtils.nodeNameEquals(node, DESCRIPTION_ELEMENT) ! && !DomUtils.nodeNameEquals(node, META_ELEMENT)) { // Child element is what we're looking for. if (subElement != null) { --- 880,885 ---- for (int i = 0; i < nl.getLength(); i++) { Node node = nl.item(i); ! if (node instanceof Element && !DomUtils.nodeNameEquals(node, DESCRIPTION_ELEMENT) && ! !DomUtils.nodeNameEquals(node, META_ELEMENT)) { // Child element is what we're looking for. if (subElement != null) { *************** *** 902,908 **** boolean hasRefAttribute = ele.hasAttribute(REF_ATTRIBUTE); boolean hasValueAttribute = ele.hasAttribute(VALUE_ATTRIBUTE); ! if ((hasRefAttribute && hasValueAttribute) || ((hasRefAttribute || hasValueAttribute) && subElement != null)) { ! error(elementName ! + " is only allowed to contain either 'ref' attribute OR 'value' attribute OR sub-element", ele); } --- 894,901 ---- boolean hasRefAttribute = ele.hasAttribute(REF_ATTRIBUTE); boolean hasValueAttribute = ele.hasAttribute(VALUE_ATTRIBUTE); ! if ((hasRefAttribute && hasValueAttribute) || ! ((hasRefAttribute || hasValueAttribute) && subElement != null)) { ! error(elementName + ! " is only allowed to contain either 'ref' attribute OR 'value' attribute OR sub-element", ele); } *************** *** 938,942 **** * Parse a value, ref or collection sub-element of a property or * constructor-arg element. - * * @param ele subelement of property element; we don't know which yet * @param defaultTypeClassName the default type (class name) for any --- 931,934 ---- *************** *** 1012,1019 **** /** * Return a typed String value Object for the given 'idref' element. - * - * @param ele - * @param bd - * @return */ public Object parseIdRefElement(Element ele) { --- 1004,1007 ---- *************** *** 1039,1046 **** /** * Return a typed String value Object for the given value element. - * - * @param ele element - * @param defaultTypeClassName type class name - * @return typed String value Object */ public Object parseValueElement(Element ele, String defaultTypeClassName) { --- 1027,1030 ---- *************** *** 1062,1066 **** /** * Build a typed String value Object for the given raw value. - * * @see org.springframework.beans.factory.config.TypedStringValue */ --- 1046,1049 ---- *************** *** 1168,1178 **** boolean hasKeyAttribute = entryEle.hasAttribute(KEY_ATTRIBUTE); boolean hasKeyRefAttribute = entryEle.hasAttribute(KEY_REF_ATTRIBUTE); ! if ((hasKeyAttribute && hasKeyRefAttribute) || ((hasKeyAttribute || hasKeyRefAttribute)) && keyEle != null) { ! error("<entry> element is only allowed to contain either " ! + "a 'key' attribute OR a 'key-ref' attribute OR a <key> sub-element", entryEle); } if (hasKeyAttribute) { ! key = buildTypedStringValueForMap(entryEle.getAttribute(KEY_ATTRIBUTE), defaultKeyTypeClassName, ! entryEle); } else if (hasKeyRefAttribute) { --- 1151,1162 ---- boolean hasKeyAttribute = entryEle.hasAttribute(KEY_ATTRIBUTE); boolean hasKeyRefAttribute = entryEle.hasAttribute(KEY_REF_ATTRIBUTE); ! if ((hasKeyAttribute && hasKeyRefAttribute) || ! ((hasKeyAttribute || hasKeyRefAttribute)) && keyEle != null) { ! error("<entry> element is only allowed to contain either " + ! "a 'key' attribute OR a 'key-ref' attribute OR a <key> sub-element", entryEle); } if (hasKeyAttribute) { ! key = buildTypedStringValueForMap( ! entryEle.getAttribute(KEY_ATTRIBUTE), defaultKeyTypeClassName, entryEle); } else if (hasKeyRefAttribute) { *************** *** 1196,1207 **** boolean hasValueAttribute = entryEle.hasAttribute(VALUE_ATTRIBUTE); boolean hasValueRefAttribute = entryEle.hasAttribute(VALUE_REF_ATTRIBUTE); ! if ((hasValueAttribute && hasValueRefAttribute) || ((hasValueAttribute || hasValueRefAttribute)) ! && valueEle != null) { ! error("<entry> element is only allowed to contain either " ! + "'value' attribute OR 'value-ref' attribute OR <value> sub-element", entryEle); } if (hasValueAttribute) { ! value = buildTypedStringValueForMap(entryEle.getAttribute(VALUE_ATTRIBUTE), defaultValueTypeClassName, ! entryEle); } else if (hasValueRefAttribute) { --- 1180,1191 ---- boolean hasValueAttribute = entryEle.hasAttribute(VALUE_ATTRIBUTE); boolean hasValueRefAttribute = entryEle.hasAttribute(VALUE_REF_ATTRIBUTE); ! if ((hasValueAttribute && hasValueRefAttribute) || ! ((hasValueAttribute || hasValueRefAttribute)) && valueEle != null) { ! error("<entry> element is only allowed to contain either " + ! "'value' attribute OR 'value-ref' attribute OR <value> sub-element", entryEle); } if (hasValueAttribute) { ! value = buildTypedStringValueForMap( ! entryEle.getAttribute(VALUE_ATTRIBUTE), defaultValueTypeClassName, entryEle); } else if (hasValueRefAttribute) { *************** *** 1230,1234 **** /** * Build a typed String value Object for the given raw value. - * * @see org.springframework.beans.factory.config.TypedStringValue */ --- 1214,1217 ---- *************** *** 1319,1324 **** } ! public BeanDefinitionHolder decorateBeanDefinitionIfRequired(Element ele, BeanDefinitionHolder definitionHolder, ! BeanDefinition containingBd) { BeanDefinitionHolder finalDefinition = definitionHolder; --- 1302,1307 ---- } ! public BeanDefinitionHolder decorateBeanDefinitionIfRequired( ! Element ele, BeanDefinitionHolder definitionHolder, BeanDefinition containingBd) { BeanDefinitionHolder finalDefinition = definitionHolder; *************** *** 1342,1347 **** } ! private BeanDefinitionHolder decorateIfRequired(Node node, BeanDefinitionHolder originalDef, ! BeanDefinition containingBd) { String namespaceUri = node.getNamespaceURI(); --- 1325,1330 ---- } ! private BeanDefinitionHolder decorateIfRequired( ! Node node, BeanDefinitionHolder originalDef, BeanDefinition containingBd) { String namespaceUri = node.getNamespaceURI(); *************** *** 1371,1384 **** BeanDefinition innerDefinition = parseCustomElement(ele, containingBd); if (innerDefinition == null) { ! error("Incorrect usage of element '" + ele.getNodeName() + "' in a nested manner. " ! + "This tag cannot be used nested inside <property>.", ele); return null; } ! String id = ele.getNodeName() + BeanDefinitionReaderUtils.GENERATED_BEAN_NAME_SEPARATOR ! + ObjectUtils.getIdentityHexString(innerDefinition); if (logger.isDebugEnabled()) { ! logger.debug("Using generated bean name [" + id + "] for nested custom element '" + ele.getNodeName() + "'"); } return new BeanDefinitionHolder(innerDefinition, id); } } --- 1354,1369 ---- BeanDefinition innerDefinition = parseCustomElement(ele, containingBd); if (innerDefinition == null) { ! error("Incorrect usage of element '" + ele.getNodeName() + "' in a nested manner. " + ! "This tag cannot be used nested inside <property>.", ele); return null; } ! String id = ele.getNodeName() + BeanDefinitionReaderUtils.GENERATED_BEAN_NAME_SEPARATOR + ! ObjectUtils.getIdentityHexString(innerDefinition); if (logger.isDebugEnabled()) { ! logger.debug("Using generated bean name [" + id + ! "] for nested custom element '" + ele.getNodeName() + "'"); } return new BeanDefinitionHolder(innerDefinition, id); } + } |
|
From: Arjen J.W. P. <po...@us...> - 2008-10-27 14:04:28
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12582 Modified Files: build.xml Log Message: Removed references to bnd-generated manifests. Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.314 retrieving revision 1.315 diff -C2 -d -r1.314 -r1.315 *** build.xml 23 Oct 2008 22:37:22 -0000 1.314 --- build.xml 27 Oct 2008 14:04:15 -0000 1.315 *************** *** 496,500 **** </delete> ! <jar jarfile="${dist.dir}/modules/spring-aop.jar" manifest="${basedir}/osgi/manifest/spring-aop.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aop.packages"/> --- 496,500 ---- </delete> ! <jar jarfile="${dist.dir}/modules/spring-aop.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aop.packages"/> *************** *** 509,513 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-beans.jar" manifest="${basedir}/osgi/manifest/spring-beans.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.beans.packages"/> --- 509,513 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-beans.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.beans.packages"/> *************** *** 522,526 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-context.jar" manifest="${basedir}/osgi/manifest/spring-context.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.packages"/> --- 522,526 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-context.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.packages"/> *************** *** 535,539 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-context-support.jar" manifest="${basedir}/osgi/manifest/spring-context-support.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.support.packages"/> --- 535,539 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-context-support.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.support.packages"/> *************** *** 547,551 **** </jar> ! <jarjar jarfile="${dist.dir}/modules/spring-core.jar" manifest="${basedir}/osgi/manifest/spring-core.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.core.packages"/> --- 547,551 ---- </jar> ! <jarjar jarfile="${dist.dir}/modules/spring-core.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.core.packages"/> *************** *** 562,566 **** </jarjar> ! <jar jarfile="${dist.dir}/modules/spring-jdbc.jar" manifest="${basedir}/osgi/manifest/spring-jdbc.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jdbc.packages"/> --- 562,566 ---- </jarjar> ! <jar jarfile="${dist.dir}/modules/spring-jdbc.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jdbc.packages"/> *************** *** 574,578 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-jms.jar" manifest="${basedir}/osgi/manifest/spring-jms.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jms.packages"/> --- 574,578 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-jms.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jms.packages"/> *************** *** 587,591 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-orm.jar" manifest="${basedir}/osgi/manifest/spring-orm.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.orm.packages"/> --- 587,591 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-orm.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.orm.packages"/> *************** *** 599,603 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-test.jar" manifest="${basedir}/osgi/manifest/spring-test.mf"> <fileset dir="${target.mockclasses.dir}"> <patternset refid="spring.test.packages"/> --- 599,603 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-test.jar"> <fileset dir="${target.mockclasses.dir}"> <patternset refid="spring.test.packages"/> *************** *** 611,615 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-tx.jar" manifest="${basedir}/osgi/manifest/spring-tx.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tx.packages"/> --- 611,615 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-tx.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tx.packages"/> *************** *** 624,628 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-web.jar" manifest="${basedir}/osgi/manifest/spring-web.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.web.packages"/> --- 624,628 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-web.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.web.packages"/> *************** *** 636,640 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc.jar" manifest="${basedir}/osgi/manifest/spring-webmvc.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.packages"/> --- 636,640 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.packages"/> *************** *** 648,652 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-portlet.jar" manifest="${basedir}/osgi/manifest/spring-webmvc-portlet.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.portlet.packages"/> --- 648,652 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-portlet.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.portlet.packages"/> *************** *** 660,664 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-struts.jar" manifest="${basedir}/osgi/manifest/spring-webmvc-struts.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.struts.packages"/> --- 660,664 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-struts.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.struts.packages"/> *************** *** 686,689 **** --- 686,693 ---- classpathref="bundlor-classpath"/> + <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-agent.jar" outputPath="${dist.dir}/modules/spring-agent.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.instrument.mf"/> + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-aop.jar" outputPath="${dist.dir}/modules/spring-aop.jar" mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" *************** *** 726,729 **** --- 730,737 ---- manifestTemplatePath="${bundlor.mf.dir}/org.springframework.test.mf"/> + <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-tomcat-weaver.jar" outputPath="${dist.dir}/weaving/spring-tomcat-weaver.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.instrument.classloading.mf"/> + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-tx.jar" outputPath="${dist.dir}/modules/spring-tx.jar" mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" *************** *** 982,986 **** </delete> ! <jar jarfile="${dist.dir}/weaving/spring-agent.jar" manifest="${basedir}/osgi/manifest/spring-agent.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.agent.packages"/> --- 990,994 ---- </delete> ! <jar jarfile="${dist.dir}/weaving/spring-agent.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.agent.packages"/> *************** *** 995,999 **** </jar> ! <jar jarfile="${dist.dir}/weaving/spring-aspects.jar" manifest="${basedir}/osgi/manifest/spring-aspects.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aspects.packages"/> --- 1003,1007 ---- </jar> ! <jar jarfile="${dist.dir}/weaving/spring-aspects.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aspects.packages"/> *************** *** 1007,1011 **** </jar> ! <jar jarfile="${dist.dir}/weaving/spring-tomcat-weaver.jar" manifest="${basedir}/osgi/manifest/spring-tomcat-weaver.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tomcat.weaver.packages"/> --- 1015,1019 ---- </jar> ! <jar jarfile="${dist.dir}/weaving/spring-tomcat-weaver.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tomcat.weaver.packages"/> |
|
From: Juergen H. <jho...@us...> - 2008-10-27 13:43:30
|
Update of /cvsroot/springframework/spring/test/org/springframework/scheduling/quartz In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8681/test/org/springframework/scheduling/quartz Modified Files: QuartzSupportTests.java Log Message: added explicit test for Scheduler isolation per ApplicationContext Index: QuartzSupportTests.java =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/scheduling/quartz/QuartzSupportTests.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** QuartzSupportTests.java 20 Oct 2008 14:00:46 -0000 1.17 --- QuartzSupportTests.java 27 Oct 2008 13:43:17 -0000 1.18 *************** *** 894,897 **** --- 894,912 ---- assertEquals("quartz1", scheduler1.getSchedulerName()); assertEquals("quartz2", scheduler2.getSchedulerName()); + + ClassPathXmlApplicationContext ctx2 = + new ClassPathXmlApplicationContext("/org/springframework/scheduling/quartz/multipleSchedulers.xml"); + try { + Scheduler scheduler1a = (Scheduler) ctx2.getBean("scheduler1"); + Scheduler scheduler2a = (Scheduler) ctx2.getBean("scheduler2"); + assertNotSame(scheduler1a, scheduler2a); + assertNotSame(scheduler1a, scheduler1); + assertNotSame(scheduler2a, scheduler2); + assertEquals("quartz1", scheduler1a.getSchedulerName()); + assertEquals("quartz2", scheduler2a.getSchedulerName()); + } + finally { + ctx2.close(); + } } finally { |
|
From: Juergen H. <jho...@us...> - 2008-10-27 13:43:28
|
Update of /cvsroot/springframework/spring/src/org/springframework/scheduling/quartz In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8681/src/org/springframework/scheduling/quartz Modified Files: SchedulerFactoryBean.java Log Message: added explicit test for Scheduler isolation per ApplicationContext Index: SchedulerFactoryBean.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/scheduling/quartz/SchedulerFactoryBean.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** SchedulerFactoryBean.java 20 Oct 2008 14:00:46 -0000 1.44 --- SchedulerFactoryBean.java 27 Oct 2008 13:43:17 -0000 1.45 *************** *** 68,73 **** * <p>When using persistent jobs, it is strongly recommended to perform all * operations on the Scheduler within Spring-managed (or plain JTA) transactions. ! * Else, database locking will not properly work and might even break. ! * (See {@link #setDataSource setDataSource} javadoc for details.) * * <p>The preferred way to achieve transactional execution is to demarcate --- 68,73 ---- * <p>When using persistent jobs, it is strongly recommended to perform all * operations on the Scheduler within Spring-managed (or plain JTA) transactions. ! * Otherwise, database locking will not properly work and might even break. ! * (See the {@link #setDataSource setDataSource} javadoc for details.) * * <p>The preferred way to achieve transactional execution is to demarcate *************** *** 82,90 **** * @author Juergen Hoeller * @since 18.02.2004 * @see #setDataSource * @see org.quartz.Scheduler * @see org.quartz.SchedulerFactory * @see org.quartz.impl.StdSchedulerFactory ! * @see org.springframework.transaction.interceptor.TransactionProxyFactoryBean */ public class SchedulerFactoryBean extends SchedulerAccessor --- 82,93 ---- * @author Juergen Hoeller * @since 18.02.2004 + * @see #setConfigLocation + * @see #setQuartzProperties * @see #setDataSource + * @see #setJobFactory * @see org.quartz.Scheduler * @see org.quartz.SchedulerFactory * @see org.quartz.impl.StdSchedulerFactory ! * @see org.quartz.Job */ public class SchedulerFactoryBean extends SchedulerAccessor *************** *** 576,580 **** } if (!this.exposeSchedulerInRepository) { ! // Need to remove it in this case, since Quartz shares the Scheduler instance by default! SchedulerRepository.getInstance().remove(newScheduler.getSchedulerName()); } --- 579,584 ---- } if (!this.exposeSchedulerInRepository) { ! // Need to explicitly remove it if not intended for exposure, ! // since Quartz shares the Scheduler instance by default! SchedulerRepository.getInstance().remove(newScheduler.getSchedulerName()); } |
|
From: Juergen H. <jho...@us...> - 2008-10-24 22:38:11
|
Update of /cvsroot/springframework/spring/src/org/springframework/orm/hibernate3 In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9263/src/org/springframework/orm/hibernate3 Modified Files: HibernateTransactionManager.java Log Message: fixed HibernateTransactionManager's "earlyFlushBeforeCommit" feature to apply to the outermost transaction only Index: HibernateTransactionManager.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/orm/hibernate3/HibernateTransactionManager.java,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** HibernateTransactionManager.java 23 Oct 2008 09:25:39 -0000 1.42 --- HibernateTransactionManager.java 24 Oct 2008 22:38:06 -0000 1.43 *************** *** 299,312 **** * Set whether to perform an early flush before proceeding with a commit. * <p>Default is "false", performing an implicit flush as part of the actual ! * commit step. Switch this to "true" in order to enforce an explicit flush ! * at the end of each successfully passed transaction boundary. ! * <p>This can be used to automatically make Hibernate-driven database changes ! * visible at the end of inner transactions, e.g. in order to have JDBC access ! * code operating on the flushed data later on in the same transaction. * <p>An early flush happens before the before-commit synchronization phase, * making flushed state visible to <code>beforeCommit</code> callbacks of registered * {@link org.springframework.transaction.support.TransactionSynchronization} * objects. Such explicit flush behavior is consistent with Spring-driven ! * flushing in a JTA transaction environment, so may also be enforced for * consistency with JTA transaction behavior. * @see #prepareForCommit --- 299,309 ---- * Set whether to perform an early flush before proceeding with a commit. * <p>Default is "false", performing an implicit flush as part of the actual ! * commit step. Switch this to "true" in order to enforce an explicit early ! * flush right <i>before</i> the actual commit step. * <p>An early flush happens before the before-commit synchronization phase, * making flushed state visible to <code>beforeCommit</code> callbacks of registered * {@link org.springframework.transaction.support.TransactionSynchronization} * objects. Such explicit flush behavior is consistent with Spring-driven ! * flushing in a JTA transaction environment, so may also get enforced for * consistency with JTA transaction behavior. * @see #prepareForCommit *************** *** 631,635 **** protected void prepareForCommit(DefaultTransactionStatus status) { ! if (this.earlyFlushBeforeCommit) { HibernateTransactionObject txObject = (HibernateTransactionObject) status.getTransaction(); Session session = txObject.getSessionHolder().getSession(); --- 628,632 ---- protected void prepareForCommit(DefaultTransactionStatus status) { ! if (this.earlyFlushBeforeCommit && status.isNewTransaction()) { HibernateTransactionObject txObject = (HibernateTransactionObject) status.getTransaction(); Session session = txObject.getSessionHolder().getSession(); *************** *** 643,649 **** } finally { ! if (status.isNewTransaction()) { ! session.setFlushMode(FlushMode.NEVER); ! } } } --- 640,644 ---- } finally { ! session.setFlushMode(FlushMode.NEVER); } } |
|
From: Juergen H. <jho...@us...> - 2008-10-24 11:30:50
|
Update of /cvsroot/springframework/spring/src/org/springframework/web/context/request In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7769/src/org/springframework/web/context/request Modified Files: FacesWebRequest.java Log Message: fixed FacesWebRequest's "getParameterValues" implementation to use "ExternalContext.getRequestParameterValuesMap" Index: FacesWebRequest.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/web/context/request/FacesWebRequest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FacesWebRequest.java 20 Feb 2008 12:38:19 -0000 1.1 --- FacesWebRequest.java 24 Oct 2008 10:33:26 -0000 1.2 *************** *** 58,62 **** public String[] getParameterValues(String paramName) { ! return (String[]) getExternalContext().getRequestParameterMap().get(paramName); } --- 58,62 ---- public String[] getParameterValues(String paramName) { ! return (String[]) getExternalContext().getRequestParameterValuesMap().get(paramName); } |
13 messages has been excluded from this view by a project administrator.
