You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/12/24 14:32:40 UTC
svn commit: r893759 - in /myfaces/core/trunk: api/pom.xml impl/pom.xml
Author: matzew
Date: Thu Dec 24 13:32:40 2009
New Revision: 893759
URL: http://svn.apache.org/viewvc?rev=893759&view=rev
Log:
MYFACES-2290 - Add OSGi bundle information and bundle classloader / activator
committed David Jencks' patch for MYFACES-2290
=> Geronimo integration of myfaces 2 cannot proceed without this patch.
The attached patch changes the osgi metadata installed by the maven-bundle-plugin so that myfaces can be used with osgi bundles with normal package versioning for javaee6, mostly allowing use of a servlet 3.0 spec jar. Note that this does not affect the ability to use myfaces 2 with earlier spec jars, it only allows myfaces to be used in ee6 containers that run under osgi.
Thanks to David Jencks for the patch!
Modified:
myfaces/core/trunk/api/pom.xml
myfaces/core/trunk/impl/pom.xml
Modified: myfaces/core/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/pom.xml?rev=893759&r1=893758&r2=893759&view=diff
==============================================================================
--- myfaces/core/trunk/api/pom.xml (original)
+++ myfaces/core/trunk/api/pom.xml Thu Dec 24 13:32:40 2009
@@ -221,12 +221,12 @@
</Export-Package>
<Import-Package>
javax.el;version="[1.0.0, 3.0.0)",
- javax.servlet;version="[2.5.0, 3.0.0)",
- javax.servlet.http;version="[2.5.0, 3.0.0)",
- javax.servlet.jsp;version="[2.1.0, 3.0.0)",
+ javax.servlet;version="[2.5.0, 3.1)",
+ javax.servlet.http;version="[2.5.0, 3.1)",
+ javax.servlet.jsp;version="[2.1.0, 3.1)",
javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
javax.servlet.jsp.jstl.sql;version="[1.1.2, 2.0.0)",
- javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)",
+ javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
javax.faces.*;version="${project.version}"
</Import-Package>
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=893759&r1=893758&r2=893759&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Thu Dec 24 13:32:40 2009
@@ -223,13 +223,13 @@
javax.ejb;resolution:=optional,
javax.el;version="[1.0.0, 3.0.0)",
javax.naming,
- javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional,
- javax.portlet;version="[1.0.0, 2.0.0)";resolution:=optional,
- javax.servlet;version="[2.5.0, 3.0.0)",
- javax.servlet.http;version="[2.5.0, 3.0.0)",
- javax.servlet.jsp;version="[2.1.0, 3.0.0)",
+ javax.persistence;version="[1.0.0, 2.1)";resolution:=optional,
+ javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
+ javax.servlet;version="[2.5.0, 3.1)",
+ javax.servlet.http;version="[2.5.0, 3.1)",
+ javax.servlet.jsp;version="[2.1.0, 3.1)",
javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
- javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)",
+ javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
javax.xml.parsers,
org.apache;resolution:=optional,
org.apache.commons.beanutils;version="[1.7.0, 2.0.0)",