Menu
▾
▴
[Springframework-cvs] spring/osgi/bundlor org.springframework.beans.mf, 1.2, 1.3 org.springframework.web.mf, 1.2, 1.3 org.springframework.aspects.mf, 1.2, 1.3 org.springframework.instrument.classloading.mf, 1.1, 1.2 org.springframework.jms.mf, 1.2, 1.3 org.springframework.context.support.mf, 1.2, 1.3 org.springframework.transaction.mf, 1.2, 1.3 org.springframework.context.mf, 1.2, 1.3 org.springframework.web.servlet.mf, 1.2, 1.3 org.springframework.aop.mf, 1.2, 1.3 org.springframework.jdbc.mf, 1.2, 1.3 org.springframework.test.mf, 1.2, 1.3 org.springframework.web.portlet.mf, 1.2, 1.3 org.springframework.web.struts.mf, 1.2, 1.3 org.springframework.orm.mf, 1.3, 1.4 org.springframework.core.mf, 1.2, 1.3
Update of /cvsroot/springframework/spring/osgi/bundlor In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19310/osgi/bundlor Modified Files: org.springframework.beans.mf org.springframework.web.mf org.springframework.aspects.mf org.springframework.instrument.classloading.mf org.springframework.jms.mf org.springframework.context.support.mf org.springframework.transaction.mf org.springframework.context.mf org.springframework.web.servlet.mf org.springframework.aop.mf org.springframework.jdbc.mf org.springframework.test.mf org.springframework.web.portlet.mf org.springframework.web.struts.mf org.springframework.orm.mf org.springframework.core.mf Log Message: + update OSGi templates + changed Maven version to 2.5.6-SNAPSHOT Index: org.springframework.web.struts.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.struts.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.web.struts.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.web.struts.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 6,10 **** javax.servlet.*;version="[2.4.0, 3.0.0)", org.apache.commons.beanutils.*;version="[1.7.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.struts.*;version="[1.2.9, 2.0.0)", org.springframework.beans.*;version="[2.5.6, 2.5.6]", --- 6,10 ---- javax.servlet.*;version="[2.4.0, 3.0.0)", org.apache.commons.beanutils.*;version="[1.7.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.struts.*;version="[1.2.9, 2.0.0)", org.springframework.beans.*;version="[2.5.6, 2.5.6]", Index: org.springframework.test.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.test.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.test.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.test.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- Import-Template: javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, + javax.naming.*;resolution:=optional, javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.portlet.*;version="[1.0.0, 2.0.0)";resolution:=optional, *************** *** 10,15 **** javax.servlet.http;version="[2.4.0, 3.0.0)";resolution:=optional, javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, junit.framework.*;version="[3.8.2, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional, org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, --- 11,17 ---- javax.servlet.http;version="[2.4.0, 3.0.0)";resolution:=optional, javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, + javax.sql;resolution:=optional, junit.framework.*;version="[3.8.2, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional, org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, Index: org.springframework.orm.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.orm.mf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** org.springframework.orm.mf 24 Oct 2008 09:47:45 -0000 1.3 --- org.springframework.orm.mf 28 Oct 2008 13:04:32 -0000 1.4 *************** *** 12,16 **** --- 12,19 ---- javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, + javax.sql.*;resolution:=optional, + javax.naming.*;resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, + javax.xml.parsers.*;resolution:=optional, oracle.toplink.essentials.*;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional, oracle.toplink.exceptions;version="[10.1.3, 11.0.0)";resolution:=optional, *************** *** 25,30 **** oracle.toplink.threetier;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.tools.*;version="[10.1.3, 11.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.openjpa.persistence.*;version="[1.0.2, 2.0.0)";resolution:=optional, org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, --- 28,33 ---- oracle.toplink.threetier;version="[10.1.3, 11.0.0)";resolution:=optional, oracle.toplink.tools.*;version="[10.1.3, 11.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.openjpa.persistence.*;version="[1.0.2, 2.0.0)";resolution:=optional, org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, *************** *** 50,65 **** org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.dao.*;version="[2.5.6, 2.5.6]", org.springframework.instrument.classloading.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jdbc.*;version="[2.5.6, 2.5.6]", org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]", org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional Unversioned-Imports: javax.naming.*, --- 53,70 ---- org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.dao.*;version="[2.5.6, 2.5.6]", org.springframework.instrument.classloading.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.jdbc.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax;resolution:=optional Unversioned-Imports: javax.naming.*, Index: org.springframework.aop.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aop.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.aop.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.aop.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,16 **** Import-Template: com.jamonapi.*;version="[2.4.0, 3.0.0)";resolution:=optional, ! net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: ! org.w3c.dom.* --- 5,17 ---- Import-Template: com.jamonapi.*;version="[2.4.0, 3.0.0)";resolution:=optional, ! net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: ! org.w3c.dom.* \ No newline at end of file Index: org.springframework.web.portlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.portlet.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.web.portlet.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.web.portlet.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 7,19 **** javax.servlet.*;version="[2.4.0, 3.0.0)", org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", ! org.springframework.stereotype;version="[2.5.6, 2.5.6]", ! org.springframework.ui.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]", ! org.springframework.validation.*;version="[2.5.6, 2.5.6]", ! org.springframework.web.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: org.xml.sax.* --- 7,20 ---- javax.servlet.*;version="[2.4.0, 3.0.0)", org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: org.xml.sax.* Index: org.springframework.aspects.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.aspects.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.aspects.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.aspects.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 4,9 **** Bundle-ManifestVersion: 2 Import-Template: ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional --- 4,9 ---- Bundle-ManifestVersion: 2 Import-Template: ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional Index: org.springframework.transaction.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.transaction.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.transaction.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.transaction.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 4,26 **** Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.6, 2.5.6]" Import-Template: com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, ! javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]", org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.management.*, javax.naming.*, ! org.w3c.dom.* --- 4,37 ---- Bundle-ManifestVersion: 2 Import-Package: ! com.evermind.server;resolution:=optional, ! com.ibm.ws.Transaction;resolution:=optional, ! oracle.j2ee.transaction;resolution:=optional, ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, ! weblogic.transaction;resolution:=optional Import-Template: com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional, ! javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, ! javax.management.*;resolution:=optional, ! javax.naming.*;resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: + com.evermind.server, + com.ibm.ws.Transaction, javax.management.*, javax.naming.*, ! oracle.j2ee.transaction, ! org.w3c.dom.*, ! weblogic.transaction Index: org.springframework.jdbc.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jdbc.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.jdbc.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.jdbc.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 3,22 **** Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional, com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.dao.*;version="[2.5.6, 2.5.6]", org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]", ! org.springframework.util;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.naming.*, javax.sql, javax.xml.transform.*, org.w3c.dom.* --- 3,37 ---- Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 + Import-Package: + oracle.sql;resolution:=optional, + org.jboss.resource.adapter.jdbc;resolution:=optional, + weblogic.jdbc.extensions;resolution:=optional, + com.ibm.websphere.rsadapter;resolution:=optional, + com.ibm.ws.rsadapter.jdbc;resolution:=optional Import-Template: com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional, com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, + javax.naming.*;resolution:=optional, + javax.sql;resolution:=optional, javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, ! javax.xml.transform.*;resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.dao.*;version="[2.5.6, 2.5.6]", org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: javax.naming.*, javax.sql, javax.xml.transform.*, + oracle.sql, + org.jboss.resource.adapter.jdbc, + weblogic.jdbc.extensions, + com.ibm.websphere.rsadapter, + com.ibm.ws.rsadapter.jdbc, org.w3c.dom.* Index: org.springframework.web.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.web.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.web.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 12,31 **** javax.servlet.http;version="[2.4.0, 3.0.0)", javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", org.apache.axis.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.taglibs.*;version="[1.1.2, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.remoting.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: com.sun.net.*, --- 12,33 ---- javax.servlet.http;version="[2.4.0, 3.0.0)", javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional, + javax.xml.namespace.*;resolution:=optional, javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.axis.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.apache.taglibs.*;version="[1.1.2, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.remoting.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: com.sun.net.*, Index: org.springframework.instrument.classloading.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.instrument.classloading.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.springframework.instrument.classloading.mf 23 Oct 2008 15:03:50 -0000 1.1 --- org.springframework.instrument.classloading.mf 28 Oct 2008 13:04:32 -0000 1.2 *************** *** 4,6 **** Bundle-ManifestVersion: 2 Import-Template: ! org.apache.catalina.*;version="[6.0.16, 7.0.0)" --- 4,6 ---- Bundle-ManifestVersion: 2 Import-Template: ! org.apache.catalina.*;version="[5.5.23, 7.0.0)" Index: org.springframework.context.support.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.support.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.context.support.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.context.support.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 7,25 **** freemarker.*;version="[2.3.12, 3.0.0)";resolution:=optional, javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional, org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional, org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.jdbc.datasource.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.naming.*, --- 7,27 ---- freemarker.*;version="[2.3.12, 3.0.0)";resolution:=optional, javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, + javax.naming.*;resolution:=optional, javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, + javax.sql.*;resolution:=optional, net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional, org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jdbc.datasource.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional Unversioned-Imports: javax.naming.*, Index: org.springframework.web.servlet.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.servlet.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.web.servlet.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.web.servlet.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 4,8 **** Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.6, 2.5.6]", org.apache.tiles.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional --- 4,8 ---- Bundle-ManifestVersion: 2 Import-Package: ! org.springframework.stereotype;version="[2.5.6, 2.5.6]";resolution:=optional, org.apache.tiles.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional, org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional *************** *** 12,23 **** javax.servlet;version="[2.4.0, 3.0.0)", javax.servlet.http;version="[2.4.0, 3.0.0)", ! javax.servlet.jsp;version="[2.1.0, 3.0.0)", ! javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)", ! javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)", jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional, org.apache.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional, org.apache.tiles;version="[2.0.5, 3.0.0)";resolution:=optional, --- 12,25 ---- javax.servlet;version="[2.4.0, 3.0.0)", javax.servlet.http;version="[2.4.0, 3.0.0)", ! javax.servlet.jsp;version="[2.1.0, 3.0.0)";resolution:=optional, ! javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)";resolution:=optional, ! javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)";resolution:=optional, ! javax.sql.*;resolution:=optional, ! javax.xml.transform.*;resolution:=optional, jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional, org.apache.tiles;version="[2.0.5, 3.0.0)";resolution:=optional, *************** *** 36,46 **** org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", ! org.springframework.ui.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]", ! org.springframework.validation.*;version="[2.5.6, 2.5.6]", ! org.springframework.web.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.sql.*, --- 38,50 ---- org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.ui.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.validation.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.web.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: javax.sql.*, Index: org.springframework.beans.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.beans.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.beans.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.beans.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,12 **** Import-Template: javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]", Unversioned-Imports: javax.xml.parsers.*, --- 5,15 ---- Import-Template: javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional, + javax.xml.parsers.*;resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: javax.xml.parsers.*, Index: org.springframework.context.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.context.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.context.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.context.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,9 **** Import-Package: javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.springframework.orm.jpa.support;version="[2.5.6, 2.5.6]";resolution:=optional Import-Template: bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, --- 5,10 ---- Import-Package: javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.springframework.orm.jpa.support;version="[2.5.6, 2.5.6]";resolution:=optional, ! com.ibm.websphere.management;resolution:=optional Import-Template: bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional, *************** *** 17,35 **** javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, ! net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional, oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.instrument.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]", ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: com.sun.net.*, javax.management.*, --- 18,45 ---- javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional, + javax.management.*;resolution:=optional, + javax.naming.*;resolution:=optional, + javax.rmi.*;resolution:=optional, + javax.xml.namespace.*;resolution:=optional, javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, ! net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.instrument.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.metadata.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.omg.CORBA.*;resolution:=optional, ! org.omg.CORBA_2_3.*;resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: + com.ibm.websphere.management, com.sun.net.*, javax.management.*, *************** *** 40,42 **** org.omg.CORBA_2_3.*, org.w3c.dom.*, ! org.xml.sax.* --- 50,52 ---- org.omg.CORBA_2_3.*, org.w3c.dom.*, ! org.xml.sax.* \ No newline at end of file Index: org.springframework.jms.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.jms.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.jms.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.jms.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 5,16 **** Import-Template: javax.jms.*;version="[1.1.0, 2.0.0)", javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)", ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]", ! org.springframework.beans.*;version="[2.5.6, 2.5.6]", ! org.springframework.context.*;version="[2.5.6, 2.5.6]", ! org.springframework.core.*;version="[2.5.6, 2.5.6]", org.springframework.jca.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, --- 5,17 ---- Import-Template: javax.jms.*;version="[1.1.0, 2.0.0)", + javax.naming.*;resolution:=optional, javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional, ! org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, ! org.apache.commons.logging;version="[1.0.4, 2.0.0)", org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional, ! org.springframework.aop.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.beans.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.context.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.core.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jca.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.jndi.*;version="[2.5.6, 2.5.6]";resolution:=optional, *************** *** 18,22 **** org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]" Unversioned-Imports: javax.naming.*, --- 19,24 ---- org.springframework.scheduling.*;version="[2.5.6, 2.5.6]";resolution:=optional, org.springframework.transaction.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.springframework.util.*;version="[2.5.6, 2.5.6]";resolution:=optional, ! org.w3c.dom.*;resolution:=optional Unversioned-Imports: javax.naming.*, Index: org.springframework.core.mf =================================================================== RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.core.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.springframework.core.mf 23 Oct 2008 16:20:01 -0000 1.2 --- org.springframework.core.mf 28 Oct 2008 13:04:32 -0000 1.3 *************** *** 3,15 **** Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, ! org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional Unversioned-Imports: javax.xml.transform.*, org.w3c.dom.*, org.xml.sax.* --- 3,22 ---- Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 + Import-Package: + org.eclipse.core.runtime;common="split";resolution:=optional Import-Template: edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, + javax.xml.transform.*;resolution:=optional, org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, ! org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, ! org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional, ! org.w3c.dom.*;resolution:=optional, ! org.xml.sax.*;resolution:=optional Unversioned-Imports: javax.xml.transform.*, + org.eclipse.core.runtime, org.w3c.dom.*, org.xml.sax.* |
