385317 - Loosen the version constraints on javax packages because they don't always match the bundle version
diff --git a/org.eclipse.virgo.web.enterprise.appdeployer/template.mf b/org.eclipse.virgo.web.enterprise.appdeployer/template.mf
index ad98e78..a8e4f7a 100644
--- a/org.eclipse.virgo.web.enterprise.appdeployer/template.mf
+++ b/org.eclipse.virgo.web.enterprise.appdeployer/template.mf
@@ -5,8 +5,8 @@
Bundle-Version: ${version}
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/virgo.web.enterprise.appdeployer.xml
-Import-Template: javax.ejb;version="${javax.ejb:[=.=.=, +1)}",
- javax.validation;version="${javax.validation:[=.=.=, +1)}",
+Import-Template: javax.ejb;version="0",
+ javax.validation;version="0",
org.apache.catalina.*;version="${org.apache.catalina:[=.=.=, +1)}",
org.apache.naming.*;version="${org.apache.catalina:[=.=.=, +1)}",
org.apache.openejb.*;version="0",
diff --git a/org.eclipse.virgo.web.enterprise.applistener/template.mf b/org.eclipse.virgo.web.enterprise.applistener/template.mf
index 732fae8..64ebe1f 100644
--- a/org.eclipse.virgo.web.enterprise.applistener/template.mf
+++ b/org.eclipse.virgo.web.enterprise.applistener/template.mf
@@ -5,7 +5,7 @@
Bundle-Version: ${version}
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Fragment-Host: org.eclipse.gemini.web.tomcat
-Import-Template: javax.servlet;version="${javax.servlet:[=.=.=, +1)}",
+Import-Template: javax.servlet;version="0",
org.eclipse.virgo.web.enterprise.openejb.deployer;version="0",
org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, +1)}",
org.apache.catalina.*;version="${org.apache.catalina:[=.=.=, +1)}",
diff --git a/org.eclipse.virgo.web.enterprise.jsf.support/template.mf b/org.eclipse.virgo.web.enterprise.jsf.support/template.mf
index a484301..977236e 100644
--- a/org.eclipse.virgo.web.enterprise.jsf.support/template.mf
+++ b/org.eclipse.virgo.web.enterprise.jsf.support/template.mf
@@ -4,10 +4,10 @@
Bundle-SymbolicName: org.eclipse.virgo.web.enterprise.jsf.support
Bundle-Version: ${version}
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Template: javax.annotation;version="${javax.annotation:[=.=.=, +1)}",
- javax.ejb;version="${javax.ejb:[=.=.=, +1)}",
- javax.persistence;version="${javax.persistence:[=.=.=, +1)}",
- com.sun.faces.spi;version="${org.glassfish.com.sun.faces:[=.=.=, +1)}",
+Import-Template: javax.annotation;version="0",
+ javax.ejb;version="0",
+ javax.persistence;version="0",
+ com.sun.faces.spi;version="0",
org.apache.naming;version="${org.apache.catalina:[=.=.=, +1)}",
javax.naming;version="0"
Excluded-Exports:
diff --git a/org.eclipse.virgo.web.enterprise.services.accessor/template.mf b/org.eclipse.virgo.web.enterprise.services.accessor/template.mf
index f97cebe..6edd593 100644
--- a/org.eclipse.virgo.web.enterprise.services.accessor/template.mf
+++ b/org.eclipse.virgo.web.enterprise.services.accessor/template.mf
@@ -5,7 +5,7 @@
Bundle-Version: ${version}
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/wab_classloader_customizer.xml
-Import-Template: javax.servlet;version="${javax.servlet:[=.=.=, +1)}",
+Import-Template: javax.servlet;version="0",
org.apache.tomcat;version="${org.apache.tomcat.api:[=.=.=, +1)}",
org.eclipse.virgo.kernel.equinox.extensions.hooks;version="${org.eclipse.virgo.kernel:[=.=.=, +1)}",
org.eclipse.gemini.web.tomcat.spi;version="0",
