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 ---- |