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: Juergen H. <jho...@us...> - 2008-10-24 11:26:29
|
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3098/osgi/bundlor Modified Files: org.springframework.orm.mf Log Message: updated Hibernate version range to include 3.3.0 Index: org.springframework.orm.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.orm.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.orm.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.orm.mf 24 Oct 2008 09:47:45 -0000 1.3 *************** *** 29,53 **** 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, ! org.hibernate;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.cache;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.cfg;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.classic;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.connection;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.context;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.criterion;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.dialect;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.ejb;version="[3.3.0.ga, 3.4.0)";resolution:=optional, ! org.hibernate.engine;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.event.*;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.exception;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.impl;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.jdbc;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.persister.entity;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.transform;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.transaction;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.type;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.usertype;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.hibernate.util;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.springframework.aop.*;version="[2.5.6, 2.5.6]", org.springframework.beans.*;version="[2.5.6, 2.5.6]", --- 29,53 ---- 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, ! 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.springframework.aop.*;version="[2.5.6, 2.5.6]", org.springframework.beans.*;version="[2.5.6, 2.5.6]", |
Update of /cvsroot/springframework/spring/osgi/manifest In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31146/manifest Removed Files: spring-agent.mf spring-aop.mf spring-aspects.mf spring-beans.mf spring-context-support.mf spring-context.mf spring-core.mf spring-jdbc.mf spring-jms.mf spring-orm.mf spring-test.mf spring-tomcat-weaver.mf spring-tx.mf spring-web.mf spring-webmvc-portlet.mf spring-webmvc-struts.mf spring-webmvc.mf Log Message: Removed manifest directories --- spring-test.mf DELETED --- --- spring-core.mf DELETED --- --- spring-webmvc-struts.mf DELETED --- --- spring-context-support.mf DELETED --- --- spring-jms.mf DELETED --- --- spring-tx.mf DELETED --- --- spring-orm.mf DELETED --- --- spring-beans.mf DELETED --- --- spring-agent.mf DELETED --- --- spring-web.mf DELETED --- --- spring-jdbc.mf DELETED --- --- spring-context.mf DELETED --- --- spring-aop.mf DELETED --- --- spring-aspects.mf DELETED --- --- spring-webmvc-portlet.mf DELETED --- --- spring-webmvc.mf DELETED --- --- spring-tomcat-weaver.mf DELETED --- |
|
From: Juergen H. <jho...@us...> - 2008-10-24 10:39:14
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8117 Modified Files: changelog.txt readme.txt Log Message: prepared for 2.5.6 release Index: changelog.txt =================================================================== RCS file: /cvsroot/springframework/spring/changelog.txt,v retrieving revision 1.738 retrieving revision 1.739 diff -C2 -d -r1.738 -r1.739 *** changelog.txt 21 Oct 2008 20:01:43 -0000 1.738 --- changelog.txt 24 Oct 2008 10:36:32 -0000 1.739 *************** *** 4,8 **** ! Changes in version 2.5.6 (2008-10-22) ------------------------------------- --- 4,8 ---- ! Changes in version 2.5.6 (2008-10-27) ------------------------------------- *************** *** 108,112 **** --- 108,114 ---- * 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) * added "persistenceXmlLocation" property to DefaultPersistenceUnitManager, as alternative to "persistenceXmlLocations" * @PersistenceContext of type TRANSACTION allows returned Query objects to be parameterized and executed as well *************** *** 139,142 **** --- 141,145 ---- Package org.springframework.util + * fixed "StringUtils.delete" to prevent an eternal loop in case of the pattern being empty * "StringUtils.cleanPath" preserves leading slash if given in original path * "FileSystemUtils.copyRecursively" ignores 'special' files (i.e. neither a regular file nor a directory) *************** *** 146,149 **** --- 149,153 ---- * revised "WebUtils.extractFilenameFromUrlPath" to search actual URI part only even when given a URL with query string * Log4jNestedDiagnosticContextFilter/Interceptor explicitly remove the NDC stack if depth=0 after the "NDC.pop()" call + * fixed FacesWebRequest's "getParameterValues" implementation to use "ExternalContext.getRequestParameterValuesMap" * PortletContextResource cleans given path (analogous to ServletContextResource) * Servlet/PortletContextResource accept path with leading "/../" part as well (as accepted by most servlet containers) Index: readme.txt =================================================================== RCS file: /cvsroot/springframework/spring/readme.txt,v retrieving revision 1.160 retrieving revision 1.161 diff -C2 -d -r1.160 -r1.161 *** readme.txt 2 Jul 2008 14:16:38 -0000 1.160 --- readme.txt 24 Oct 2008 10:36:32 -0000 1.161 *************** *** 1,4 **** ! THE SPRING FRAMEWORK, release 2.5.6 (July 2008) ! ----------------------------------------------- http://www.springframework.org --- 1,4 ---- ! THE SPRING FRAMEWORK, release 2.5.6 (October 2008) ! -------------------------------------------------- http://www.springframework.org *************** *** 113,117 **** - Dependencies: spring-core, (spring-beans, AOP Alliance) ! * "spring-beans" (~475 KB) - Contents: JavaBeans support, bean container - Dependencies: spring-core --- 113,117 ---- - Dependencies: spring-core, (spring-beans, AOP Alliance) ! * "spring-beans" (~480 KB) - Contents: JavaBeans support, bean container - Dependencies: spring-core *************** *** 129,141 **** - Dependencies: Commons Logging, (Commons Attributes) ! * "spring-jdbc" (~320 KB) - Contents: JDBC support - Dependencies: spring-beans, spring-tx ! * "spring-jms" (~185 KB) - Contents: JMS 1.0.2/1.1 support - Dependencies: spring-beans, spring-tx, JMS API ! * "spring-orm" (~365 KB) - Contents: JDO support, JPA support, Hibernate support, TopLink support, iBATIS support - Dependencies: spring-jdbc, (spring-web) --- 129,141 ---- - Dependencies: Commons Logging, (Commons Attributes) ! * "spring-jdbc" (~330 KB) - Contents: JDBC support - Dependencies: spring-beans, spring-tx ! * "spring-jms" (~190 KB) - Contents: JMS 1.0.2/1.1 support - Dependencies: spring-beans, spring-tx, JMS API ! * "spring-orm" (~370 KB) - Contents: JDO support, JPA support, Hibernate support, TopLink support, iBATIS support - Dependencies: spring-jdbc, (spring-web) *************** *** 161,165 **** - Dependencies: spring-web, Portlet API, (spring-webmvc) ! * "spring-webmvc-struts" (~40 KB) - Contents: Struts 1.x action support, Tiles 1.x view support - Dependencies: spring-web, Struts API, (spring-webmvc) --- 161,165 ---- - Dependencies: spring-web, Portlet API, (spring-webmvc) ! * "spring-webmvc-struts" (~35 KB) - Contents: Struts 1.x action support, Tiles 1.x view support - Dependencies: spring-web, Struts API, (spring-webmvc) |
|
From: Arjen J.W. P. <po...@us...> - 2008-10-24 09:04:16
|
Update of /cvsroot/springframework/spring/lib/bnd In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30913/lib/bnd Removed Files: bnd.jar Log Message: Removed bnd --- bnd.jar DELETED --- |
|
From: Arjen J.W. P. <po...@us...> - 2008-10-23 22:37:29
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23976 Modified Files: build.xml project.properties Log Message: Integrated bundlor in the build Index: project.properties =================================================================== RCS file: /cvsroot/springframework/spring/project.properties,v retrieving revision 1.159 retrieving revision 1.160 diff -C2 -d -r1.159 -r1.160 *** project.properties 17 Sep 2008 17:21:03 -0000 1.159 --- project.properties 23 Oct 2008 22:37:22 -0000 1.160 *************** *** 179,180 **** --- 179,182 ---- spring-bundle-prefix=org.springframework.bundle.spring + + bundlor.mf.dir=${basedir}/osgi/bundlor/ Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.313 retrieving revision 1.314 diff -C2 -d -r1.313 -r1.314 *** build.xml 23 Oct 2008 16:19:07 -0000 1.313 --- build.xml 23 Oct 2008 22:37:22 -0000 1.314 *************** *** 15,19 **** --> ! <project name="spring-core" default="usage" basedir="." xmlns:maven="antlib:org.apache.maven.artifact.ant"> <property file="build.properties"/> --- 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"/> *************** *** 41,44 **** --- 43,53 ---- </condition> + <condition property="bundlor.available"> + <and> + <istrue value="${tiger.available}"/> + <available file="${lib.dir}/bundlor" type="dir"/> + </and> + </condition> + <path id="all-libs"> *************** *** 47,50 **** --- 56,60 ---- <include name="**/*.jar"/> <exclude name="aspectj/aspectjtools.jar"/> + <exclude name="bundlor/*.jar"/> <exclude name="junit/*.jar"/> </fileset> *************** *** 664,667 **** --- 674,752 ---- + <target name="bundlor" depends="modulejars,weavingjars" description="Run jars through Bundlor" if="bundlor.available"> + <path id="bundlor-classpath"> + + <fileset dir="${lib.dir}/bundlor"> + <include name="**/*.jar"/> + </fileset> + + </path> + + <taskdef resource="com/springsource/bundlor/ant/antlib.xml" uri="antlib:com.springsource.bundlor.ant" + classpathref="bundlor-classpath"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-aop.jar" outputPath="${dist.dir}/modules/spring-aop.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.aop.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-aspects.jar" outputPath="${dist.dir}/weaving/spring-aspects.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.aspects.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-beans.jar" outputPath="${dist.dir}/modules/spring-beans.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.beans.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-context.jar" outputPath="${dist.dir}/modules/spring-context.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.context.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-context-support.jar" outputPath="${dist.dir}/modules/spring-context-support.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.context.support.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-core.jar" outputPath="${dist.dir}/modules/spring-core.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.core.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-jdbc.jar" outputPath="${dist.dir}/modules/spring-jdbc.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.jdbc.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-jms.jar" outputPath="${dist.dir}/modules/spring-jms.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.jms.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-orm.jar" outputPath="${dist.dir}/modules/spring-orm.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.orm.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-test.jar" outputPath="${dist.dir}/modules/spring-test.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.test.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-tx.jar" outputPath="${dist.dir}/modules/spring-tx.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.transaction.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-web.jar" outputPath="${dist.dir}/modules/spring-web.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-webmvc-portlet.jar" outputPath="${dist.dir}/modules/spring-webmvc-portlet.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.portlet.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-webmvc.jar" outputPath="${dist.dir}/modules/spring-webmvc.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.servlet.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-webmvc-struts.jar" outputPath="${dist.dir}/modules/spring-webmvc-struts.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.struts.mf"/> + + </target> + + <target name="modulesources" depends="initdist" description="Create module-specific source JAR files"> <delete> *************** *** 1015,1019 **** ! <target name="alljars" depends="fulljar,fullsources,modulejars,modulesources,weavingjars,weavingsources" description="Create all JAR files"/> --- 1100,1104 ---- ! <target name="alljars" depends="fulljar,fullsources,modulejars,modulesources,weavingjars,weavingsources,bundlor" description="Create all JAR files"/> |
Update of /cvsroot/springframework/spring/lib/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21200/bundlor Added Files: com.springsource.bundlor-1.0.0.M1.jar com.springsource.bundlor.ant-1.0.0.M1.jar com.springsource.org.antlr-3.0.1.jar com.springsource.org.apache.commons.cli-1.1.0.jar com.springsource.org.apache.commons.logging-1.1.1.jar com.springsource.org.apache.ws.commons.schema-1.3.2.jar com.springsource.org.objectweb.asm-3.1.0.jar com.springsource.org.objectweb.asm.commons-3.1.0.jar com.springsource.org.objectweb.asm.tree-3.1.0.jar com.springsource.server.osgi.manifest-1.0.0.BUILD-20080905115514.jar com.springsource.server.serviceability.ffdc-1.0.0.BUILD-20080905115514.jar com.springsource.server.serviceability.output-1.0.0.BUILD-20080905115514.jar com.springsource.server.serviceability.tracing-1.0.0.BUILD-20080905115514.jar com.springsource.slf4j.api-1.5.0.jar com.springsource.slf4j.org.apache.commons.logging-1.5.0.jar com.springsource.slf4j.org.apache.log4j-1.5.0.jar org.eclipse.osgi-3.4.0.v20080605-1900.jar org.springframework.beans-2.5.5.A.jar org.springframework.core-2.5.5.A.jar org.springframework.xml-1.5.2.A.jar Log Message: Added bundlor --- NEW FILE: org.springframework.xml-1.5.2.A.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.org.antlr-3.0.1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: org.springframework.beans-2.5.5.A.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.slf4j.org.apache.commons.logging-1.5.0.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.org.objectweb.asm.commons-3.1.0.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.org.objectweb.asm-3.1.0.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.org.apache.ws.commons.schema-1.3.2.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.org.apache.commons.logging-1.1.1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.server.serviceability.ffdc-1.0.0.BUILD-20080905115514.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.org.apache.commons.cli-1.1.0.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.server.serviceability.tracing-1.0.0.BUILD-20080905115514.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.slf4j.api-1.5.0.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: org.eclipse.osgi-3.4.0.v20080605-1900.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.org.objectweb.asm.tree-3.1.0.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.bundlor.ant-1.0.0.M1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.slf4j.org.apache.log4j-1.5.0.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.server.osgi.manifest-1.0.0.BUILD-20080905115514.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: org.springframework.core-2.5.5.A.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.bundlor-1.0.0.M1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: com.springsource.server.serviceability.output-1.0.0.BUILD-20080905115514.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Arjen J.W. P. <po...@us...> - 2008-10-23 22:15:21
|
Update of /cvsroot/springframework/spring/lib/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20668/bundlor Log Message: Directory /cvsroot/springframework/spring/lib/bundlor added to the repository |
|
From: Juergen H. <jho...@us...> - 2008-10-23 17:28:37
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30786 Modified Files: Tag: mbranch-2-0 changelog.txt readme.txt Log Message: prepared for 2.0.9 release Index: changelog.txt =================================================================== RCS file: /cvsroot/springframework/spring/changelog.txt,v retrieving revision 1.558.2.66 retrieving revision 1.558.2.67 diff -C2 -d -r1.558.2.66 -r1.558.2.67 *** changelog.txt 16 Oct 2008 19:31:48 -0000 1.558.2.66 --- changelog.txt 23 Oct 2008 17:28:26 -0000 1.558.2.67 *************** *** 4,8 **** ! Changes in version 2.0.9 (2008-10-27) ------------------------------------- --- 4,8 ---- ! Changes in version 2.0.9 (2008-10-24) ------------------------------------- *************** *** 88,91 **** --- 88,93 ---- Package org.springframework.util + * fixed "StringUtils.delete" to prevent an eternal loop in case of the pattern being empty + * "StringUtils.cleanPath" preserves leading slash if given in original path * NumberUtils avoids overflow when converting from BigDecimal to BigInteger * removed Commons Log usage from SystemPropertyUtils, ClassUtils, FileCopyUtils (avoiding early Log4J initialization) *************** *** 95,98 **** --- 97,101 ---- * ServletRequestAttributes keeps hold onto the original session if a "request.getSession" call suddenly returns null * OncePerRequestFilter cleans up its marker attribute at the end of each outer request (for Portlet compatibility) + * exposed "getParamName()" method on LocaleChangeInterceptor and ThemeChangeInterceptor * AbstractTemplateView catches "HttpServletResponse.getContentType()" exceptions (for JBoss Portal compatibility) * revised XsltView to specify full resource URI as StreamSource system id, for properly resolving relative paths Index: readme.txt =================================================================== RCS file: /cvsroot/springframework/spring/readme.txt,v retrieving revision 1.122.2.12 retrieving revision 1.122.2.13 diff -C2 -d -r1.122.2.12 -r1.122.2.13 *** readme.txt 29 May 2008 21:20:45 -0000 1.122.2.12 --- readme.txt 23 Oct 2008 17:28:26 -0000 1.122.2.13 *************** *** 1,4 **** ! THE SPRING FRAMEWORK, release 2.0.9 (May 2008) ! ---------------------------------------------- http://www.springframework.org --- 1,4 ---- ! THE SPRING FRAMEWORK, release 2.0.9 (October 2008) ! -------------------------------------------------- http://www.springframework.org |
|
From: Juergen H. <jho...@us...> - 2008-10-23 17:21:48
|
Update of /cvsroot/springframework/spring/tiger/src/org/springframework/orm/jpa/vendor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30204/tiger/src/org/springframework/orm/jpa/vendor Modified Files: HibernateJpaDialect.java Log Message: HibernateJpaDialect checks "EntityManager.getDelegate()" as well to find Hibernate Session (for Seam compatibility) Index: HibernateJpaDialect.java =================================================================== RCS file: /cvsroot/springframework/spring/tiger/src/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HibernateJpaDialect.java 8 Sep 2007 15:04:36 -0000 1.5 --- HibernateJpaDialect.java 23 Oct 2008 17:21:42 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright 2002-2007 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); --- 1,4 ---- /* ! * Copyright 2002-2008 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); *************** *** 99,103 **** protected Session getSession(EntityManager em) { ! return ((HibernateEntityManager) em).getSession(); } --- 99,115 ---- protected Session getSession(EntityManager em) { ! if (em instanceof HibernateEntityManager) { ! return ((HibernateEntityManager) em).getSession(); ! } ! else { ! Object delegate = em.getDelegate(); ! if (delegate instanceof Session) { ! return (Session) delegate; ! } ! else { ! throw new IllegalStateException( ! "Cannot obtain native Hibernate Session from given JPA EntityManager: " + em.getClass()); ! } ! } } |
|
From: Juergen H. <jho...@us...> - 2008-10-23 17:04:23
|
Update of /cvsroot/springframework/spring/tiger/test/org/springframework/web/servlet/mvc/annotation In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28895/tiger/test/org/springframework/web/servlet/mvc/annotation Modified Files: ServletAnnotationControllerTests.java Log Message: polishing Index: ServletAnnotationControllerTests.java =================================================================== RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ServletAnnotationControllerTests.java 8 Oct 2008 11:08:29 -0000 1.33 --- ServletAnnotationControllerTests.java 23 Oct 2008 17:04:17 -0000 1.34 *************** *** 687,691 **** @RequestMapping(method = RequestMethod.GET) ! public void myPath2(HttpServletResponse response) throws IOException { response.getWriter().write("test"); } --- 687,691 ---- @RequestMapping(method = RequestMethod.GET) ! public void myPath2(HttpServletResponse response) throws IOException { response.getWriter().write("test"); } *************** *** 697,716 **** @RequestMapping("/myPath1.do") ! public void myHandle(HttpServletRequest request, HttpServletResponse response) throws IOException { response.getWriter().write("test"); } @RequestMapping("/myPath2.do") ! public void myHandle(@RequestParam("param1") String p1, @RequestParam("param2") int p2, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + p1 + "-" + p2); } @RequestMapping("/myPath3") ! public void myHandle(TestBean tb, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + tb.getAge()); } @RequestMapping("/myPath4.do") ! public void myHandle(TestBean tb, Errors errors, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + errors.getFieldError("age").getCode()); } --- 697,716 ---- @RequestMapping("/myPath1.do") ! public void myHandle(HttpServletRequest request, HttpServletResponse response) throws IOException { response.getWriter().write("test"); } @RequestMapping("/myPath2.do") ! public void myHandle(@RequestParam("param1") String p1, @RequestParam("param2") int p2, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + p1 + "-" + p2); } @RequestMapping("/myPath3") ! public void myHandle(TestBean tb, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + tb.getAge()); } @RequestMapping("/myPath4.do") ! public void myHandle(TestBean tb, Errors errors, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + errors.getFieldError("age").getCode()); } *************** *** 723,742 **** @RequestMapping ! public void myHandle(HttpServletRequest request, HttpServletResponse response) throws IOException { response.getWriter().write("test"); } @RequestMapping("/myPath2.do") ! public void myHandle(@RequestParam("param1") String p1, int param2, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + p1 + "-" + param2); } @RequestMapping("/myPath3") ! public void myHandle(TestBean tb, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + tb.getAge()); } @RequestMapping("/myPath4.*") ! public void myHandle(TestBean tb, Errors errors, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + errors.getFieldError("age").getCode()); } --- 723,742 ---- @RequestMapping ! public void myHandle(HttpServletRequest request, HttpServletResponse response) throws IOException { response.getWriter().write("test"); } @RequestMapping("/myPath2.do") ! public void myHandle(@RequestParam("param1") String p1, int param2, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + p1 + "-" + param2); } @RequestMapping("/myPath3") ! public void myHandle(TestBean tb, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + tb.getAge()); } @RequestMapping("/myPath4.*") ! public void myHandle(TestBean tb, Errors errors, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + errors.getFieldError("age").getCode()); } *************** *** 748,752 **** @RequestMapping("/myPath2.do") ! public void myHandle(@RequestParam("param1") T p1, int param2, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + p1 + "-" + param2); } --- 748,752 ---- @RequestMapping("/myPath2.do") ! public void myHandle(@RequestParam("param1") T p1, int param2, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + p1 + "-" + param2); } *************** *** 766,785 **** @RequestMapping ! public void myHandle(HttpServletRequest request, HttpServletResponse response) throws IOException { response.getWriter().write("test"); } @Override ! public void myHandle(@RequestParam("param1") String p1, int param2, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + p1 + "-" + param2); } @RequestMapping("/myPath3") ! public void myHandle(TestBean tb, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + tb.getAge()); } @RequestMapping("/myPath4.*") ! public void myHandle(TestBean tb, Errors errors, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + errors.getFieldError("age").getCode()); } --- 766,785 ---- @RequestMapping ! public void myHandle(HttpServletRequest request, HttpServletResponse response) throws IOException { response.getWriter().write("test"); } @Override ! public void myHandle(@RequestParam("param1") String p1, int param2, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + p1 + "-" + param2); } @RequestMapping("/myPath3") ! public void myHandle(TestBean tb, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + tb.getAge()); } @RequestMapping("/myPath4.*") ! public void myHandle(TestBean tb, Errors errors, HttpServletResponse response) throws IOException { response.getWriter().write("test-" + tb.getName() + "-" + errors.getFieldError("age").getCode()); } |
Update of /cvsroot/springframework/spring/osgi/bnd In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26705/osgi/bnd Removed Files: readme.txt spring-aop.bnd spring-aspects.bnd spring-beans.bnd spring-context-support.bnd spring-context.bnd spring-core.bnd spring-jdbc.bnd spring-jms.bnd spring-orm.bnd spring-test.bnd spring-tx.bnd spring-web.bnd spring-webmvc-portlet.bnd spring-webmvc-struts.bnd spring-webmvc.bnd spring.bnd Log Message: Removed bnd templates --- spring-jms.bnd DELETED --- --- spring.bnd DELETED --- --- spring-context.bnd DELETED --- --- spring-beans.bnd DELETED --- --- spring-web.bnd DELETED --- --- spring-core.bnd DELETED --- --- spring-jdbc.bnd DELETED --- --- spring-context-support.bnd DELETED --- --- spring-webmvc.bnd DELETED --- --- spring-webmvc-portlet.bnd DELETED --- --- spring-webmvc-struts.bnd DELETED --- --- spring-test.bnd DELETED --- --- spring-aspects.bnd DELETED --- --- spring-orm.bnd DELETED --- --- spring-tx.bnd DELETED --- --- spring-aop.bnd DELETED --- --- readme.txt DELETED --- |
Update of /cvsroot/springframework/spring/osgi/manifest In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26288/manifest Added Files: spring-agent.mf spring-aop.mf spring-aspects.mf spring-beans.mf spring-context-support.mf spring-context.mf spring-core.mf spring-jdbc.mf spring-jms.mf spring-orm.mf spring-test.mf spring-tomcat-weaver.mf spring-tx.mf spring-web.mf spring-webmvc-portlet.mf spring-webmvc-struts.mf spring-webmvc.mf Log Message: Added manifests --- NEW FILE: spring-test.mf --- --- NEW FILE: spring-core.mf --- --- NEW FILE: spring-webmvc-struts.mf --- --- NEW FILE: spring-context-support.mf --- --- NEW FILE: spring-jms.mf --- --- NEW FILE: spring-tx.mf --- --- NEW FILE: spring-orm.mf --- --- NEW FILE: spring-beans.mf --- --- NEW FILE: spring-agent.mf --- --- NEW FILE: spring-web.mf --- --- NEW FILE: spring-jdbc.mf --- --- NEW FILE: spring-context.mf --- --- NEW FILE: spring-aop.mf --- --- NEW FILE: spring-aspects.mf --- --- NEW FILE: spring-webmvc-portlet.mf --- --- NEW FILE: spring-webmvc.mf --- --- NEW FILE: spring-tomcat-weaver.mf --- |
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26288/bundlor Modified Files: org.springframework.aop.mf org.springframework.aspects.mf org.springframework.beans.mf org.springframework.context.mf org.springframework.context.support.mf org.springframework.core.mf org.springframework.jdbc.mf org.springframework.jms.mf org.springframework.orm.mf org.springframework.test.mf org.springframework.transaction.mf org.springframework.web.mf org.springframework.web.portlet.mf org.springframework.web.servlet.mf org.springframework.web.struts.mf Log Message: Added manifests Index: org.springframework.web.struts.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.struts.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.web.struts.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.web.struts.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 8,19 **** 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.5.A, 2.5.5.A]", ! org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.validation.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]" ! Ignored-Existing-Headers: ! Bnd-LastModified, ! Import-Package, ! Export-Package, ! Tool --- 8,14 ---- 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]", ! org.springframework.context.*;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]" Index: org.springframework.test.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.test.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.test.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.test.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 15,26 **** org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.junit.*;version="[4.4.0, 5.0.0)";resolution:=optional, ! org.springframework.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional Unversioned-Imports: javax.naming.*, javax.sql - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 15,21 ---- org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.junit.*;version="[4.4.0, 5.0.0)";resolution:=optional, ! org.springframework.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional Unversioned-Imports: javax.naming.*, javax.sql Index: org.springframework.orm.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.orm.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.orm.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.orm.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 45,64 **** org.hibernate.persister.entity;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.transaction;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.type;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.usertype;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 3.3.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.dao.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.instrument.classloading.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.jdbc.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional Unversioned-Imports: javax.naming.*, --- 45,65 ---- org.hibernate.persister.entity;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 3.3.0)";resolution:=optional, + org.hibernate.transform;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.transaction;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.type;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.usertype;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 3.3.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.*, *************** *** 67,74 **** org.w3c.dom.*, org.xml.sax - Ignored-Existing-Headers: - Bnd-LastModified, - DynamicImport-Package, - Import-Package, - Export-Package, - Tool --- 68,69 ---- Index: org.springframework.aop.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aop.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.aop.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.aop.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 10,22 **** 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.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: org.w3c.dom.* - Ignored-Existing-Headers: - Bnd-LastModified, - DynamicImport-Package, - Import-Package, - Export-Package, - Tool --- 10,16 ---- 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.* Index: org.springframework.web.portlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.portlet.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.web.portlet.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.web.portlet.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 8,24 **** 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.5.A, 2.5.5.A]", ! org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.validation.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: org.xml.sax.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 8,19 ---- 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.* Index: org.springframework.transaction.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.transaction.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.transaction.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.transaction.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 4,8 **** Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]" Import-Template: com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, --- 4,8 ---- 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, *************** *** 13,32 **** 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.5.A, 2.5.5.A]", ! org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.scheduling.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.management.*, javax.naming.*, org.w3c.dom.* - Ignored-Existing-Headers: - Bnd-LastModified, - DynamicImport-Package, - Import-Package, - Export-Package, - Tool --- 13,26 ---- 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.* Index: org.springframework.jdbc.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jdbc.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.jdbc.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.jdbc.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 10,19 **** 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.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.dao.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.util;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.naming.*, --- 10,19 ---- 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.*, *************** *** 21,27 **** javax.xml.transform.*, org.w3c.dom.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 21,22 ---- Index: org.springframework.web.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.web.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.web.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 21,31 **** 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.5.A, 2.5.5.A]", ! org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.remoting.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: com.sun.net.*, --- 21,31 ---- 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.*, *************** *** 33,39 **** javax.xml.namespace.*, org.xml.sax.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 33,34 ---- Index: org.springframework.context.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.context.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.context.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 5,9 **** Import-Package: javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.springframework.orm.jpa.support;version="[2.5.5.A, 2.5.5.A]";resolution:=optional Import-Template: bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, --- 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, *************** *** 25,34 **** 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.5.A, 2.5.5.A]", ! org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.instrument.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: com.sun.net.*, --- 25,34 ---- 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.*, *************** *** 41,47 **** org.w3c.dom.*, org.xml.sax.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 41,42 ---- Index: org.springframework.context.support.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.support.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.context.support.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.context.support.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 14,31 **** 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.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.jdbc.datasource.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.scheduling.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.naming.*, javax.sql.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 14,26 ---- 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.*, javax.sql.* Index: org.springframework.web.servlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.servlet.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.web.servlet.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.web.servlet.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 4,8 **** Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]", 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]", 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 *************** *** 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.5.A, 2.5.5.A]", ! org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.validation.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.sql.*, --- 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.*, *************** *** 48,54 **** org.w3c.dom.*, org.xml.sax.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 48,49 ---- Index: org.springframework.beans.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.beans.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.beans.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.beans.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 7,19 **** 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.5.A, 2.5.5.A]", ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", Unversioned-Imports: javax.xml.parsers.*, org.w3c.dom.*, org.xml.sax.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 7,14 ---- 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.*, org.w3c.dom.*, org.xml.sax.* Index: org.springframework.aspects.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aspects.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.aspects.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.aspects.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 6,14 **** 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.5.A, 2.5.5.A]", ! org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional ! Ignored-Existing-Headers: ! Bnd-LastModified, ! Import-Package, ! Export-Package, ! Tool --- 6,9 ---- 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 Index: org.springframework.jms.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jms.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.jms.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.jms.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 9,28 **** 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.5.A, 2.5.5.A]", ! org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", ! org.springframework.jca.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.remoting.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.scheduling.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, ! org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.naming.*, org.w3c.dom.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 9,23 ---- 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, ! org.springframework.remoting.*;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.*, org.w3c.dom.* Index: org.springframework.core.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.core.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.core.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.core.mf 23 Oct 2008 16:20:01 -0000 1.2 *************** *** 14,20 **** org.w3c.dom.*, org.xml.sax.* - Ignored-Existing-Headers: - Bnd-LastModified, - Import-Package, - Export-Package, - Tool --- 14,15 ---- |
|
From: Ben H. <ne...@us...> - 2008-10-23 16:19:25
|
Update of /cvsroot/springframework/spring/osgi/manifest In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26254/manifest Log Message: Directory /cvsroot/springframework/spring/osgi/manifest added to the repository |
|
From: Ben H. <ne...@us...> - 2008-10-23 16:19:14
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26211 Modified Files: build.xml Log Message: Removed bnd Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.312 retrieving revision 1.313 diff -C2 -d -r1.312 -r1.313 *** build.xml 14 Oct 2008 09:02:43 -0000 1.312 --- build.xml 23 Oct 2008 16:19:07 -0000 1.313 *************** *** 202,209 **** </patternset> - - <!-- BND tool taskdef (required for the OSGi manifest entries) --> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${lib.dir}/bnd/bnd.jar"/> - <!-- Jar Jar Links taskdef (required for repackaging ASM) --> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar/jarjar.jar"/> --- 202,205 ---- *************** *** 455,464 **** </manifest> </jarjar> - - <bndwrap definitions="${basedir}/osgi/bnd" output="${dist.dir}"> - <fileset dir="${dist.dir}" includes="spring.jar"/> - </bndwrap> - <move file="${dist.dir}/spring.bar" tofile="${dist.dir}/spring.jar"/> - </target> --- 451,454 ---- *************** *** 496,500 **** </delete> ! <jar jarfile="${dist.dir}/modules/spring-aop.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aop.packages"/> --- 486,490 ---- </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"/> *************** *** 509,513 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-beans.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.beans.packages"/> --- 499,503 ---- </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"/> *************** *** 522,526 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-context.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.packages"/> --- 512,516 ---- </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"/> *************** *** 535,539 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-context-support.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.support.packages"/> --- 525,529 ---- </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"/> *************** *** 547,551 **** </jar> ! <jarjar jarfile="${dist.dir}/modules/spring-core.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.core.packages"/> --- 537,541 ---- </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"/> *************** *** 562,566 **** </jarjar> ! <jar jarfile="${dist.dir}/modules/spring-jdbc.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jdbc.packages"/> --- 552,556 ---- </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"/> *************** *** 574,578 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-jms.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jms.packages"/> --- 564,568 ---- </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"/> *************** *** 587,591 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-orm.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.orm.packages"/> --- 577,581 ---- </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"/> *************** *** 599,603 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-test.jar"> <fileset dir="${target.mockclasses.dir}"> <patternset refid="spring.test.packages"/> --- 589,593 ---- </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"/> *************** *** 611,615 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-tx.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tx.packages"/> --- 601,605 ---- </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"/> *************** *** 624,628 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-web.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.web.packages"/> --- 614,618 ---- </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"/> *************** *** 636,640 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.packages"/> --- 626,630 ---- </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"/> *************** *** 648,652 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-portlet.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.portlet.packages"/> --- 638,642 ---- </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"/> *************** *** 660,664 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-struts.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.struts.packages"/> --- 650,654 ---- </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"/> *************** *** 671,686 **** </manifest> </jar> - - <!-- osgi wrapper --> - <bndwrap definitions="${basedir}/osgi/bnd" output="${dist.dir}/modules"> - <fileset dir="${dist.dir}/modules" includes="*.jar"/> - </bndwrap> - <move todir="${dist.dir}/modules"> - <fileset dir="${dist.dir}/modules"> - <include name="*.bar"/> - </fileset> - <mapper type="glob" from="*.bar" to="*.jar"/> - </move> - </target> --- 661,664 ---- *************** *** 919,923 **** </delete> ! <jar jarfile="${dist.dir}/weaving/spring-agent.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.agent.packages"/> --- 897,901 ---- </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"/> *************** *** 932,936 **** </jar> ! <jar jarfile="${dist.dir}/weaving/spring-aspects.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aspects.packages"/> --- 910,914 ---- </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"/> *************** *** 944,948 **** </jar> ! <jar jarfile="${dist.dir}/weaving/spring-tomcat-weaver.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tomcat.weaver.packages"/> --- 922,926 ---- </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"/> *************** *** 955,971 **** </manifest> </jar> - - <!-- osgi wrappers --> - <bndwrap definitions="${basedir}/osgi/bnd" output="${dist.dir}/weaving"> - <fileset dir="${dist.dir}/weaving" includes="spring-aspects.jar"/> - </bndwrap> - - <move todir="${dist.dir}/weaving"> - <fileset dir="${dist.dir}/weaving"> - <include name="*.bar"/> - </fileset> - <mapper type="glob" from="*.bar" to="*.jar"/> - </move> - </target> --- 933,936 ---- |
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19992/bundlor Added Files: org.springframework.aop.mf org.springframework.aspects.mf org.springframework.beans.mf org.springframework.context.mf org.springframework.context.support.mf org.springframework.core.mf org.springframework.instrument.classloading.mf org.springframework.instrument.mf org.springframework.jdbc.mf org.springframework.jms.mf org.springframework.orm.mf org.springframework.test.mf org.springframework.transaction.mf org.springframework.web.mf org.springframework.web.portlet.mf org.springframework.web.servlet.mf org.springframework.web.struts.mf Log Message: Added bundlor templates --- NEW FILE: org.springframework.web.struts.mf --- Bundle-SymbolicName: org.springframework.struts Bundle-Name: Spring Web Struts Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: 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.5.A, 2.5.5.A]", org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.validation.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]" Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.test.mf --- Bundle-SymbolicName: org.springframework.test Bundle-Name: Spring Test Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: javax.activation.*;version="[1.1.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.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, 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, org.junit.*;version="[4.4.0, 5.0.0)";resolution:=optional, org.springframework.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional Unversioned-Imports: javax.naming.*, javax.sql Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.orm.mf --- Bundle-SymbolicName: org.springframework.orm Bundle-Name: Spring ORM Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Package: com.ibatis.sqlmap.engine.transaction.external;version="[2.3.0.677, 3.0.0)";resolution:=optional, oracle.toplink.essentials.expressions;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional, org.eclipse.persistence.expressions;version="[1.0.0, 2.0.0)";resolution:=optional Import-Template: com.ibatis.*;version="[2.3.0.677, 3.0.0)";resolution:=optional, javax.jdo.*;version="[2.0.0, 3.0.0)";resolution:=optional, javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.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, 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, org.hibernate;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.cache;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.cfg;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.classic;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.connection;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.context;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.criterion;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.dialect;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.ejb;version="[3.3.0.ga, 3.4.0)";resolution:=optional, org.hibernate.engine;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.event.*;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.exception;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.impl;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.jdbc;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.persister.entity;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.transaction;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.type;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.usertype;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 3.3.0)";resolution:=optional, org.springframework.aop.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.dao.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.instrument.classloading.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.jdbc.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional Unversioned-Imports: javax.naming.*, javax.sql.*, javax.xml.parsers.*, org.w3c.dom.*, org.xml.sax Ignored-Existing-Headers: Bnd-LastModified, DynamicImport-Package, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.beans.mf --- Bundle-SymbolicName: org.springframework.beans Bundle-Name: Spring Beans Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 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.5.A, 2.5.5.A]", org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", Unversioned-Imports: javax.xml.parsers.*, org.w3c.dom.*, org.xml.sax.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.aop.mf --- Bundle-SymbolicName: org.springframework.aop Bundle-Name: Spring AOP Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 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.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: org.w3c.dom.* Ignored-Existing-Headers: Bnd-LastModified, DynamicImport-Package, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.web.portlet.mf --- Bundle-SymbolicName: org.springframework.web.portlet Bundle-Name: Spring Web Portlet Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: javax.portlet.*;version="[1.0.0, 2.0.0)", 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.5.A, 2.5.5.A]", org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]", org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.validation.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: org.xml.sax.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.aspects.mf --- Bundle-SymbolicName: org.springframework.aspects Bundle-Name: Spring Aspects Bundle-Vendor: SpringSource 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.5.A, 2.5.5.A]", org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.transaction.mf --- Bundle-SymbolicName: org.springframework.transaction Bundle-Name: Spring Transaction Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Package: org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]" 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.5.A, 2.5.5.A]", org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.metadata.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.scheduling.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.management.*, javax.naming.*, org.w3c.dom.* Ignored-Existing-Headers: Bnd-LastModified, DynamicImport-Package, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.jdbc.mf --- Bundle-SymbolicName: org.springframework.jdbc Bundle-Name: Spring JDBC 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.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.dao.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.util;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.naming.*, javax.sql, javax.xml.transform.*, org.w3c.dom.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.web.mf --- Bundle-SymbolicName: org.springframework.web Bundle-Name: Spring Web Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 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.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.5.A, 2.5.5.A]", org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.remoting.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: com.sun.net.*, javax.jws.*, javax.xml.namespace.*, org.xml.sax.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.instrument.classloading.mf --- Bundle-SymbolicName: org.springframework.instrument.classloading Bundle-Name: Spring Instrument Classloading Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.apache.catalina.*;version="[6.0.16, 7.0.0)" --- NEW FILE: org.springframework.context.support.mf --- Bundle-SymbolicName: org.springframework.context.support Bundle-Name: Spring Context Support Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: commonj.*;version="[1.1.0, 2.0.0)";resolution:=optional, 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.5.A, 2.5.5.A]";resolution:=optional, org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.jdbc.datasource.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.scheduling.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.naming.*, javax.sql.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.web.servlet.mf --- Bundle-SymbolicName: org.springframework.web.servlet Bundle-Name: Spring Web Servlet Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Package: org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]", 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 Import-Template: com.lowagie.text.*;version="[2.0.8, 3.0.0)";resolution:=optional, freemarker.*;version="[2.3.12, 3.0.0)";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)", 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, 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;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.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.validation.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.sql.*, javax.xml.transform.*, org.w3c.dom.*, org.xml.sax.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.instrument.mf --- Bundle-SymbolicName: org.springframework.instrument Bundle-Name: Spring Instrument Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 --- NEW FILE: org.springframework.context.mf --- Bundle-SymbolicName: org.springframework.context Bundle-Name: Spring Context Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Package: javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional, org.springframework.orm.jpa.support;version="[2.5.5.A, 2.5.5.A]";resolution:=optional Import-Template: 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, javax.annotation.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional, 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.5.A, 2.5.5.A]", org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.instrument.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.metadata.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: 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.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.jms.mf --- Bundle-SymbolicName: org.springframework.jms Bundle-Name: Spring JMS Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 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.5.A, 2.5.5.A]", org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]", org.springframework.jca.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.remoting.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.scheduling.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]" Unversioned-Imports: javax.naming.*, org.w3c.dom.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool --- NEW FILE: org.springframework.core.mf --- Bundle-SymbolicName: org.springframework.core Bundle-Name: Spring Core 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.* Ignored-Existing-Headers: Bnd-LastModified, Import-Package, Export-Package, Tool |
|
From: Arjen J.W. P. <po...@us...> - 2008-10-23 15:03:28
|
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19938/bundlor Log Message: Directory /cvsroot/springframework/spring/osgi/bundlor added to the repository |
|
From: Juergen H. <jho...@us...> - 2008-10-23 09:30:02
|
Update of /cvsroot/springframework/spring/src/org/springframework/orm/hibernate3 In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28517/src/org/springframework/orm/hibernate3 Modified Files: HibernateTransactionManager.java Log Message: fixed HibernateTransactionManager's "earlyFlushBeforeCommit" feature to not switch to FlushMode.NEVER too early Index: HibernateTransactionManager.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/orm/hibernate3/HibernateTransactionManager.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** HibernateTransactionManager.java 7 May 2008 10:55:41 -0000 1.41 --- HibernateTransactionManager.java 23 Oct 2008 09:25:39 -0000 1.42 *************** *** 298,308 **** /** * 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 before the before-commit synchronization phase, making ! * flushed state visible to <code>beforeCommit</code> callbacks of registered * {@link org.springframework.transaction.support.TransactionSynchronization} ! * objects. ! * <p>Such explicit flush behavior is also consistent with Spring-driven * flushing in a JTA transaction environment, so may also be enforced for * consistency with JTA transaction behavior. --- 298,311 ---- /** * 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. *************** *** 640,644 **** } finally { ! session.setFlushMode(FlushMode.NEVER); } } --- 643,649 ---- } finally { ! if (status.isNewTransaction()) { ! session.setFlushMode(FlushMode.NEVER); ! } } } |
|
From: Juergen H. <jho...@us...> - 2008-10-22 10:33:51
|
Update of /cvsroot/springframework/spring/src/org/springframework/util In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25875/src/org/springframework/util Modified Files: Tag: mbranch-2-0 StringUtils.java Log Message: fixed "StringUtils.delete" to prevent an eternal loop in case of the pattern being empty; "StringUtils.cleanPath" preserves leading slash if given in original path Index: StringUtils.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/util/StringUtils.java,v retrieving revision 1.59.2.5 retrieving revision 1.59.2.6 diff -C2 -d -r1.59.2.5 -r1.59.2.6 *** StringUtils.java 29 Feb 2008 22:40:50 -0000 1.59.2.5 --- StringUtils.java 22 Oct 2008 10:33:32 -0000 1.59.2.6 *************** *** 300,310 **** */ public static String replace(String inString, String oldPattern, String newPattern) { ! if (inString == null) { ! return null; ! } ! if (oldPattern == null || newPattern == null) { return inString; } - StringBuffer sbuf = new StringBuffer(); // output StringBuffer we'll build up --- 300,306 ---- */ public static String replace(String inString, String oldPattern, String newPattern) { ! if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) { return inString; } StringBuffer sbuf = new StringBuffer(); // output StringBuffer we'll build up *************** *** 320,324 **** } sbuf.append(inString.substring(pos)); - // remember to append any characters to the right of a match return sbuf.toString(); --- 316,319 ---- *************** *** 512,515 **** --- 507,513 ---- */ public static String cleanPath(String path) { + if (path == null) { + return null; + } String pathToUse = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR); *************** *** 524,527 **** --- 522,529 ---- pathToUse = pathToUse.substring(prefixIndex + 1); } + if (pathToUse.startsWith(FOLDER_SEPARATOR)) { + prefix = prefix + FOLDER_SEPARATOR; + pathToUse = pathToUse.substring(1); + } String[] pathArray = delimitedListToStringArray(pathToUse, FOLDER_SEPARATOR); *************** *** 530,537 **** for (int i = pathArray.length - 1; i >= 0; i--) { ! if (CURRENT_PATH.equals(pathArray[i])) { // Points to current directory - drop it. } ! else if (TOP_PATH.equals(pathArray[i])) { // Registering top path found. tops++; --- 532,540 ---- for (int i = pathArray.length - 1; i >= 0; i--) { ! String element = pathArray[i]; ! if (CURRENT_PATH.equals(element)) { // Points to current directory - drop it. } ! else if (TOP_PATH.equals(element)) { // Registering top path found. tops++; *************** *** 539,548 **** else { if (tops > 0) { ! // Merging path element with corresponding to top path. tops--; } else { // Normal path element found. ! pathElements.add(0, pathArray[i]); } } --- 542,551 ---- else { if (tops > 0) { ! // Merging path element with element corresponding to top path. tops--; } else { // Normal path element found. ! pathElements.add(0, element); } } |
|
From: Juergen H. <jho...@us...> - 2008-10-22 10:33:43
|
Update of /cvsroot/springframework/spring/test/org/springframework/util In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25875/test/org/springframework/util Modified Files: Tag: mbranch-2-0 StringUtilsTests.java Log Message: fixed "StringUtils.delete" to prevent an eternal loop in case of the pattern being empty; "StringUtils.cleanPath" preserves leading slash if given in original path Index: StringUtilsTests.java =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/util/StringUtilsTests.java,v retrieving revision 1.16.2.2 retrieving revision 1.16.2.3 diff -C2 -d -r1.16.2.2 -r1.16.2.3 *** StringUtilsTests.java 10 Sep 2007 11:18:48 -0000 1.16.2.2 --- StringUtilsTests.java 22 Oct 2008 10:33:32 -0000 1.16.2.3 *************** *** 1,4 **** /* ! * Copyright 2002-2007 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); --- 1,4 ---- /* ! * Copyright 2002-2008 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); *************** *** 172,175 **** --- 172,178 ---- String mismatch = StringUtils.delete(inString, "dxxcxcxog"); assertTrue("Result is unchanged", mismatch.equals(inString)); + + String nochange = StringUtils.delete(inString, ""); + assertTrue("Result is unchanged", nochange.equals(inString)); } *************** *** 178,193 **** String res = StringUtils.deleteAny(inString, "I"); ! assertTrue("Result has no Is [" + res + "]", ! res.equals("Able was ere saw Elba")); res = StringUtils.deleteAny(inString, "AeEba!"); ! assertTrue("Result has no Is [" + res + "]", ! res.equals("l ws I r I sw l")); String mismatch = StringUtils.deleteAny(inString, "#@$#$^"); assertTrue("Result is unchanged", mismatch.equals(inString)); ! String whitespace = ! "This is\n\n\n \t a messagy string with whitespace\n"; assertTrue("Has CR", whitespace.indexOf("\n") != -1); assertTrue("Has tab", whitespace.indexOf("\t") != -1); --- 181,193 ---- String res = StringUtils.deleteAny(inString, "I"); ! assertTrue("Result has no Is [" + res + "]", res.equals("Able was ere saw Elba")); res = StringUtils.deleteAny(inString, "AeEba!"); ! assertTrue("Result has no Is [" + res + "]", res.equals("l ws I r I sw l")); String mismatch = StringUtils.deleteAny(inString, "#@$#$^"); assertTrue("Result is unchanged", mismatch.equals(inString)); ! String whitespace = "This is\n\n\n \t a messagy string with whitespace\n"; assertTrue("Has CR", whitespace.indexOf("\n") != -1); assertTrue("Has tab", whitespace.indexOf("\t") != -1); *************** *** 270,273 **** --- 270,274 ---- assertEquals("../mypath/myfile", StringUtils.cleanPath("../mypath/../mypath/myfile")); assertEquals("../mypath/myfile", StringUtils.cleanPath("mypath/../../mypath/myfile")); + assertEquals("/../mypath/myfile", StringUtils.cleanPath("/../mypath/myfile")); } |
|
From: Juergen H. <jho...@us...> - 2008-10-22 10:16:57
|
Update of /cvsroot/springframework/spring/test/org/springframework/util In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22385/test/org/springframework/util Modified Files: StringUtilsTests.java Log Message: fixed "StringUtils.delete" to prevent an eternal loop in case of the pattern being empty Index: StringUtilsTests.java =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/util/StringUtilsTests.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** StringUtilsTests.java 30 Jul 2008 11:01:44 -0000 1.19 --- StringUtilsTests.java 22 Oct 2008 09:44:15 -0000 1.20 *************** *** 196,199 **** --- 196,202 ---- String mismatch = StringUtils.delete(inString, "dxxcxcxog"); assertTrue("Result is unchanged", mismatch.equals(inString)); + + String nochange = StringUtils.delete(inString, ""); + assertTrue("Result is unchanged", nochange.equals(inString)); } *************** *** 202,217 **** String res = StringUtils.deleteAny(inString, "I"); ! assertTrue("Result has no Is [" + res + "]", ! res.equals("Able was ere saw Elba")); res = StringUtils.deleteAny(inString, "AeEba!"); ! assertTrue("Result has no Is [" + res + "]", ! res.equals("l ws I r I sw l")); String mismatch = StringUtils.deleteAny(inString, "#@$#$^"); assertTrue("Result is unchanged", mismatch.equals(inString)); ! String whitespace = ! "This is\n\n\n \t a messagy string with whitespace\n"; assertTrue("Has CR", whitespace.indexOf("\n") != -1); assertTrue("Has tab", whitespace.indexOf("\t") != -1); --- 205,217 ---- String res = StringUtils.deleteAny(inString, "I"); ! assertTrue("Result has no Is [" + res + "]", res.equals("Able was ere saw Elba")); res = StringUtils.deleteAny(inString, "AeEba!"); ! assertTrue("Result has no Is [" + res + "]", res.equals("l ws I r I sw l")); String mismatch = StringUtils.deleteAny(inString, "#@$#$^"); assertTrue("Result is unchanged", mismatch.equals(inString)); ! String whitespace = "This is\n\n\n \t a messagy string with whitespace\n"; assertTrue("Has CR", whitespace.indexOf("\n") != -1); assertTrue("Has tab", whitespace.indexOf("\t") != -1); |
|
From: Juergen H. <jho...@us...> - 2008-10-22 10:16:52
|
Update of /cvsroot/springframework/spring/src/org/springframework/util In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22385/src/org/springframework/util Modified Files: StringUtils.java Log Message: fixed "StringUtils.delete" to prevent an eternal loop in case of the pattern being empty Index: StringUtils.java =================================================================== RCS file: /cvsroot/springframework/spring/src/org/springframework/util/StringUtils.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** StringUtils.java 1 Sep 2008 23:19:26 -0000 1.72 --- StringUtils.java 22 Oct 2008 09:44:15 -0000 1.73 *************** *** 371,381 **** */ public static String replace(String inString, String oldPattern, String newPattern) { ! if (inString == null) { ! return null; ! } ! if (oldPattern == null || newPattern == null) { return inString; } - StringBuffer sbuf = new StringBuffer(); // output StringBuffer we'll build up --- 371,377 ---- */ public static String replace(String inString, String oldPattern, String newPattern) { ! if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) { return inString; } StringBuffer sbuf = new StringBuffer(); // output StringBuffer we'll build up *************** *** 391,395 **** } sbuf.append(inString.substring(pos)); - // remember to append any characters to the right of a match return sbuf.toString(); --- 387,390 ---- |
|
From: Juergen H. <jho...@us...> - 2008-10-21 22:40:06
|
Update of /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3449/tiger/test/org/springframework/orm/jpa/hibernate Modified Files: hibernate-manager.xml HibernateEntityManagerFactoryIntegrationTests.java Log Message: commented out failing @Configurable test Index: hibernate-manager.xml =================================================================== RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate/hibernate-manager.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** hibernate-manager.xml 21 Oct 2008 11:02:19 -0000 1.11 --- hibernate-manager.xml 21 Oct 2008 22:40:00 -0000 1.12 *************** *** 4,8 **** xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" ! http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> --- 4,8 ---- xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" ! http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> *************** *** 13,17 **** <context:spring-configured/> ! <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,18 ---- <context:spring-configured/> ! <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"/> Index: HibernateEntityManagerFactoryIntegrationTests.java =================================================================== RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** HibernateEntityManagerFactoryIntegrationTests.java 21 Oct 2008 11:02:19 -0000 1.8 --- HibernateEntityManagerFactoryIntegrationTests.java 21 Oct 2008 22:40:00 -0000 1.9 *************** *** 26,30 **** import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests; import org.springframework.orm.jpa.EntityManagerFactoryInfo; - import org.springframework.orm.jpa.domain.ContextualPerson; import org.springframework.orm.jpa.domain.Person; --- 26,29 ---- *************** *** 76,80 **** Query q = this.sessionFactory.getCurrentSession().createQuery("select p from ContextualPerson as p"); assertEquals(0, q.list().size()); ! assertNotNull(new ContextualPerson().entityManager); } --- 75,79 ---- Query q = this.sessionFactory.getCurrentSession().createQuery("select p from ContextualPerson as p"); assertEquals(0, q.list().size()); ! //assertNotNull(new ContextualPerson().entityManager); TODO } |
|
From: Juergen H. <jho...@us...> - 2008-10-21 20:01:47
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24188 Modified Files: changelog.txt Log Message: Jdbc4SqlXmlHandler, @PersistenceContext Index: changelog.txt =================================================================== RCS file: /cvsroot/springframework/spring/changelog.txt,v retrieving revision 1.737 retrieving revision 1.738 diff -C2 -d -r1.737 -r1.738 *** changelog.txt 20 Oct 2008 14:02:43 -0000 1.737 --- changelog.txt 21 Oct 2008 20:01:43 -0000 1.738 *************** *** 62,65 **** --- 62,67 ---- Package org.springframework.jdbc + * provided Jdbc4SqlXmlHandler as default implementation of the SqlXmlHandler interface + * added SqlValue class to "jdbc.support" package, with SqlXmlValue derived from SqlValue instead of SqlTypeValue * SQLErrorCodesFactory always loads its "sql-error-codes.xml" files from Spring's class loader (-> static singleton) * added "transientDataAccessResourceCodes" category to "sql-error-codes.xml", with default codes for DB2 and Sybase *************** *** 108,111 **** --- 110,115 ---- * added "packagesToScan" property to Hibernate AnnotationSessionFactoryBean, for autodetection of @Entity classes * added "persistenceXmlLocation" property to DefaultPersistenceUnitManager, as alternative to "persistenceXmlLocations" + * @PersistenceContext of type TRANSACTION allows returned Query objects to be parameterized and executed as well + * @PersistenceContext for default EntityManagerFactory lookup works even in an @Configurable Hibernate entity Package org.springframework.remoting *************** *** 132,135 **** --- 136,140 ---- * AbstractPlatformTransactionManager resumes after any kind of inner begin failure (not just after TransactionException) * TransactionSynchronizationManager interaction gets logged at trace level only (minimizing debug log per transaction) + * JotmFactoryBean sets "defaultTimeout" value as actual JOTM default (even if no transaction timeout specified at all) Package org.springframework.util |
|
From: Juergen H. <jho...@us...> - 2008-10-21 19:55:33
|
Update of /cvsroot/springframework/spring/sandbox/src/org/springframework/jdbc/support/xml In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23464/sandbox/src/org/springframework/jdbc/support/xml Removed Files: BinaryStreamSqlXmlValue.java CharacterStreamSqlXmlValue.java DocumentSqlXmlValue.java Jdbc4XmlHandler.java ResultSqlXmlValue.java StringSqlXmlValue.java Log Message: provided Jdbc4SqlXmlHandler as default implementation of the SqlXmlHandler interface; added SqlValue class to "jdbc.support" package, with SqlXmlValue derived from SqlValue instead of SqlTypeValue --- StringSqlXmlValue.java DELETED --- --- ResultSqlXmlValue.java DELETED --- --- Jdbc4XmlHandler.java DELETED --- --- CharacterStreamSqlXmlValue.java DELETED --- --- DocumentSqlXmlValue.java DELETED --- --- BinaryStreamSqlXmlValue.java DELETED --- |
13 messages has been excluded from this view by a project administrator.
