Add manifests for el-api, jasper-el, jasper, tomcat, and tomcat-juli.

Signed-off-by: Ivan Afonichev <ivan.afonichev@gmail.com>

el-api-OSGi-MANIFEST.MF

@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Export-Package: javax.el;version="2.2.0"
+Bundle-Vendor: %bundleProvider
+Bundle-ClassPath: .
+Bundle-Version: 2.2.0
+Bundle-Name: %bundleName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: javax.el
+DynamicImport-Package: org.apache.el
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
+ 2SE-1.3
+

jasper-OSGi-MANIFEST.MF

@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c
+ ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version
+ ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas
+ per.runtime;version="7.0.21",org.apache.jasper.security;version="7.0.
+ 19",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp
+ lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v
+ ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja
+ sper.xmlparser;version="7.0.21"
+Bundle-Vendor: %bundleProvider
+Bundle-ClassPath: .
+Bundle-Version: 7.0.21
+Bundle-Localization: plugin
+Bundle-Name: %bundleName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.jasper
+Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.h
+ ttp;version="[2.4.0, 3.0.0]",javax.servlet.jsp;version="[2.0.0, 2.2.0
+ ]",javax.servlet.jsp.el;version="[2.0.0, 2.2.0]",javax.servlet.jsp.re
+ sources;version="[2.0.0, 2.2.0]",javax.servlet.jsp.tagext;version="[2
+ .0.0, 2.2.0]",javax.servlet.resources;version="[2.4.0, 3.0.0]",javax.
+ xml.parsers,org.apache.commons.el;version="[1.0.0,2.0.0)",org.apache.
+ commons.logging;version="[1.0.0,2.0.0)",org.apache.tools.ant;resoluti
+ on:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.a
+ pache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;
+ resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.
+ sax.helpers,org.apache.tomcat;version="7.0.21",org.apache.juli.loggin
+ g;version="7.0.21",javax.el;version="2.2.0",org.eclipse.jdt.internal.
+ compiler,org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.int
+ ernal.compiler.parser.diagnose,org.eclipse.jdt.internal.compiler.flow
+ ,org.eclipse.jdt.internal.compiler.util,org.eclipse.jdt.internal.comp
+ iler.impl,org.eclipse.jdt.internal.compiler.lookup,org.eclipse.jdt.in
+ ternal.compiler.codegen,org.eclipse.jdt.internal.compiler.batch,org.e
+ clipse.jdt.internal.compiler.classfmt,org.eclipse.jdt.internal.compil
+ er.ast,org.eclipse.jdt.internal.compiler.problem,org.eclipse.jdt.inte
+ rnal.compiler.env,org.eclipse.jdt.internal.core.util,org.eclipse.jdt.
+ core.compiler
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
+ 2SE-1.3
+

jasper-el-OSGi-MANIFEST.MF

@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Export-Package: org.apache.el;version="7.0.21"
+Bundle-Vendor: %bundleProvider
+Bundle-ClassPath: .
+Bundle-Version: 7.0.21
+Bundle-Name: %bundleName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Import-Package: javax.el;version="2.2"
+Bundle-SymbolicName: org.apache.el
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
+ 2SE-1.3
+

jsp-api-OSGi-MANIFEST.MF

@@ -10,4 +10,4 @@ Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
 Bundle-Version: 2.2.0.v200806031607
 Bundle-ManifestVersion: 2
 Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
- =3.0,javax.servlet.resources; version=3.0
+ =3.0,javax.servlet.resources; version=3.0,javax.el;version="2.2.0"

tomcat-api-OSGi-MANIFEST.MF

@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Export-Package: org.apache.tomcat;version="7.0.21"
+Bundle-Vendor: %bundleProvider
+Bundle-ClassPath: .
+Bundle-Version: 7.0.21
+Bundle-Name: %bundleName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.tomcat
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
+ 2SE-1.3
+

tomcat-juli-OSGi-MANIFEST.MF

@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Export-Package: org.apache.juli;version="7.0.21",org.apache.juli.loggi
+ ng;version="7.0.21"
+Bundle-Vendor: %bundleProvider
+Bundle-ClassPath: .
+Bundle-Version: 7.0.21
+Bundle-Name: %bundleName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.juli
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
+ 2SE-1.3
+

tomcat.spec

@@ -54,7 +54,7 @@
 Name:          tomcat
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         System Environment/Daemons
@@ -72,6 +72,11 @@ Source8:       servlet-api-OSGi-MANIFEST.MF
 Source9:       jsp-api-OSGi-MANIFEST.MF
 Source10:      %{name}-%{major_version}.%{minor_version}-log4j.properties
 Source11:      %{name}-%{major_version}.%{minor_version}.service
+Source12:      el-api-OSGi-MANIFEST.MF
+Source13:      jasper-el-OSGi-MANIFEST.MF
+Source14:      jasper-OSGi-MANIFEST.MF
+Source15:      tomcat-api-OSGi-MANIFEST.MF
+Source16:      tomcat-juli-OSGi-MANIFEST.MF
 Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 
@@ -267,6 +272,21 @@ zip -u output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
 cp -p %{SOURCE9} META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
 zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE12} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u output/build/lib/el-api.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE13} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u output/build/lib/jasper-el.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE14} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u output/build/lib/jasper.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE15} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE16} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
 
 %install
 # build initial path structure
@@ -565,6 +585,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Tue Sep 20 2011 Roland Grunberg <rgrunber@redhat.com> 0:7.0.21-2
+- Add manifests for el-api, jasper-el, jasper, tomcat, and tomcat-juli.
+
 * Thu Sep 8 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.21-1
 - Updated to 7.0.21