Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27861/osgi/bundlor Modified Files: Tag: branch-2-5-6-p1 org.springframework.aspects.mf org.springframework.transaction.mf org.springframework.web.struts.mf org.springframework.beans.mf org.springframework.web.mf org.springframework.web.servlet.mf org.springframework.test.mf org.springframework.orm.mf org.springframework.jms.mf org.springframework.context.mf org.springframework.context.support.mf org.springframework.jdbc.mf org.springframework.aop.mf org.springframework.web.portlet.mf Log Message: fix for garbage collection issue Index: org.springframework.jdbc.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jdbc.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.jdbc.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.jdbc.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 16,25 **** org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.dao.*;version="[2.5.6, 2.5.6]", ! org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional Unversioned-Imports: --- 16,25 ---- org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.dao.*;version="[2.5.6, 2.5.6.PR01]", ! org.springframework.jndi.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional Unversioned-Imports: Index: org.springframework.test.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.test.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.test.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.test.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 15,19 **** 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: --- 15,19 ---- 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.PR01]";resolution:=optional, org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional Unversioned-Imports: Index: org.springframework.orm.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.orm.mf,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** org.springframework.orm.mf 28 Oct 2008 17:12:08 -0000 1.5 --- org.springframework.orm.mf 16 Mar 2009 12:42:31 -0000 1.5.2.1 *************** *** 50,65 **** org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.dao.*;version="[2.5.6, 2.5.6]", ! org.springframework.instrument.classloading.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jdbc.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional, Unversioned-Imports: --- 50,65 ---- org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.dao.*;version="[2.5.6, 2.5.6.PR01]", ! org.springframework.instrument.classloading.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.jdbc.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional, Unversioned-Imports: Index: org.springframework.aop.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aop.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.aop.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.aop.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 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]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional Unversioned-Imports: --- 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.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional Unversioned-Imports: Index: org.springframework.transaction.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.transaction.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.transaction.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.transaction.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 7,11 **** com.ibm.ws.Transaction;resolution:=optional, oracle.j2ee.transaction;resolution:=optional, ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, weblogic.transaction;resolution:=optional Import-Template: --- 7,11 ---- com.ibm.ws.Transaction;resolution:=optional, oracle.j2ee.transaction;resolution:=optional, ! org.springframework.stereotype;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, weblogic.transaction;resolution:=optional Import-Template: *************** *** 17,28 **** org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional Unversioned-Imports: --- 17,28 ---- org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.scheduling.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional Unversioned-Imports: Index: org.springframework.web.portlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.portlet.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.web.portlet.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.web.portlet.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 8,19 **** org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional Unversioned-Imports: --- 8,19 ---- org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.stereotype;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.validation.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional Unversioned-Imports: Index: org.springframework.beans.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.beans.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.beans.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.beans.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 7,12 **** net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional Unversioned-Imports: --- 7,12 ---- net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional Unversioned-Imports: Index: org.springframework.web.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.mf,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** org.springframework.web.mf 30 Oct 2008 14:45:16 -0000 1.5 --- org.springframework.web.mf 16 Mar 2009 12:42:31 -0000 1.5.2.1 *************** *** 19,29 **** org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.taglibs.*;version="[1.1.2, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.remoting.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional Unversioned-Imports: --- 19,29 ---- 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.PR01]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.remoting.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional Unversioned-Imports: Index: org.springframework.context.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.context.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.context.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 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, com.ibm.websphere.management;resolution:=optional Import-Template: --- 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.PR01]";resolution:=optional, com.ibm.websphere.management;resolution:=optional Import-Template: *************** *** 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]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.instrument.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional, Unversioned-Imports: --- 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.PR01]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.instrument.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional, Unversioned-Imports: Index: org.springframework.web.struts.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.struts.mf,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** org.springframework.web.struts.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.web.struts.mf 16 Mar 2009 12:42:31 -0000 1.3.2.1 *************** *** 8,14 **** org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.struts.*;version="[1.2.9, 2.0.0)", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! 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]" --- 8,14 ---- org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.struts.*;version="[1.2.9, 2.0.0)", ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]", ! org.springframework.context.*;version="[2.5.6, 2.5.6.PR01]", ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]", ! org.springframework.validation.*;version="[2.5.6, 2.5.6.PR01]", ! org.springframework.web.*;version="[2.5.6, 2.5.6.PR01]" Index: org.springframework.context.support.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.support.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.context.support.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.context.support.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 14,25 **** org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jdbc.datasource.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional Unversioned-Imports: --- 14,25 ---- 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.PR01]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.jdbc.datasource.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.scheduling.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional Unversioned-Imports: Index: org.springframework.web.servlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.servlet.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.web.servlet.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.web.servlet.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 4,8 **** Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, org.apache.tiles.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional --- 4,8 ---- Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, org.apache.tiles.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional *************** *** 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]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, *;resolution:=optional, Unversioned-Imports: --- 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.PR01]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.validation.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional, Unversioned-Imports: Index: org.springframework.aspects.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aspects.mf,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** org.springframework.aspects.mf 28 Oct 2008 13:04:32 -0000 1.3 --- org.springframework.aspects.mf 16 Mar 2009 12:42:31 -0000 1.3.2.1 *************** *** 6,9 **** org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional --- 6,9 ---- org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional Index: org.springframework.jms.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jms.mf,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** org.springframework.jms.mf 28 Oct 2008 17:12:08 -0000 1.4 --- org.springframework.jms.mf 16 Mar 2009 12:42:31 -0000 1.4.2.1 *************** *** 9,22 **** org.apache.commons.logging;version="[1.0.4, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jca.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! 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]";resolution:=optional, *;resolution:=optional Unversioned-Imports: --- 9,22 ---- org.apache.commons.logging;version="[1.0.4, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.jca.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.jndi.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.remoting.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.scheduling.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6.PR01]";resolution:=optional, *;resolution:=optional Unversioned-Imports: |