rpms/tomcat5/devel jasper-OSGi-MANIFEST.MF, NONE, 1.1 jsp-api-OSGi-MANIFEST.MF, NONE, 1.1 servlet-api-OSGi-MANIFEST.MF, NONE, 1.1 tomcat5.spec, 1.99, 1.100

Thu Aug 9 20:37:38 UTC 2007

Author: vivekl

Update of /cvs/extras/rpms/tomcat5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6923

Modified Files:
	tomcat5.spec 
Added Files:
	jasper-OSGi-MANIFEST.MF jsp-api-OSGi-MANIFEST.MF 
	servlet-api-OSGi-MANIFEST.MF 
Log Message:
- Commit the following for Ben Konrath < bkonrath at redhat.com >:
- Add jasper-eclipse subpackage which is needed for eclipse 3.3.
- Inject OSGi manifest into servlet api jar and jsp api jar.

--- NEW FILE jasper-OSGi-MANIFEST.MF ---
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.7.0
Created-By: 2.3 (IBM Corporation)
Import-Package: javax.servlet;version="2.4",javax.servlet.http;version
 ="2.4",javax.servlet.jsp;version="2.0",javax.servlet.jsp.el;version="
 2.0",javax.servlet.jsp.resources;version="2.0",javax.servlet.jsp.tage
 xt;version="2.0",javax.servlet.resources;version="2.4",javax.xml.pars
 ers,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;resolution:=opti
 onal,org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.to
 ols.ant.types;resolution:=optional,org.apache.tools.ant.util;resoluti
 on:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.help
 ers
Bundle-ManifestVersion: 2
Export-Package: org.apache.jasper,org.apache.jasper.compiler,org.apach
 e.jasper.compiler.tagplugin,org.apache.jasper.resources,org.apache.ja
 sper.runtime,org.apache.jasper.security,org.apache.jasper.servlet,org
 .apache.jasper.tagplugins.jstl,org.apache.jasper.tagplugins.jstl.core
 ,org.apache.jasper.util,org.apache.jasper.xmlparser
Bundle-Version: 5.5.17.v200706111724
Bundle-SymbolicName: org.apache.jasper
Bundle-Name: Apache Jasper 2 Plug-in
Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
 2SE-1.3
Bundle-Localization: plugin
Bundle-Vendor: Apache Software Foundation
Bundle-ClassPath: .



--- NEW FILE jsp-api-OSGi-MANIFEST.MF ---
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.7.0
Created-By: 2.3 (IBM Corporation)
Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
 =2.4,javax.servlet.resources; version=2.4
Bundle-ManifestVersion: 2
Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
 ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
 .tagext; version=2.0
Bundle-Version: 2.0.0.v200706191603
Bundle-SymbolicName: javax.servlet.jsp
Bundle-Name: Java Server Pages API Bundle
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
Bundle-Localization: plugin
Bundle-Vendor: Apache Software Foundation



--- NEW FILE servlet-api-OSGi-MANIFEST.MF ---
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.7.0
Created-By: 2.3 (IBM Corporation)
Bundle-ManifestVersion: 2
Export-Package: javax.servlet;version="2.4",javax.servlet.http;version
 ="2.4",javax.servlet.resources;version="2.4"
Bundle-Version: 2.4.0.v200706111738
Bundle-SymbolicName: javax.servlet
Bundle-Name: Servlet API Bundle
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
Bundle-Localization: plugin
Bundle-Vendor: Apache Software Foundation



Index: tomcat5.spec
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- tomcat5.spec	23 Jul 2007 18:05:09 -0000	1.99
+++ tomcat5.spec	9 Aug 2007 20:37:02 -0000	1.100
@@ -81,6 +81,9 @@
 Source3: %{name}-%{majversion}.wrapper
 Source4: %{name}-%{majversion}.logrotate
 Source5: %{name}-%{majversion}.relink
+Source6: jasper-OSGi-MANIFEST.MF
+Source7: servlet-api-OSGi-MANIFEST.MF
+Source8: jsp-api-OSGi-MANIFEST.MF
 Patch0: %{name}-%{majversion}.link_admin_jar.patch
 Patch1: %{name}-%{majversion}-skip-build-on-install.patch
 Patch2: %{name}-%{majversion}-jt5-build.patch
@@ -398,6 +401,20 @@
 Javadoc for generated documentation %{name}-%{jname}
 %endif
 
+%if %{with_ecj}
+%package jasper-eclipse
+Group: Text Editors/Integrated Development Environments (IDE)
+Summary: Jasper OSGi Eclipse plugin        
+%if %{gcj_support}
+Requires(post):     java-gcj-compat >= 1.0.64
+Requires(postun):   java-gcj-compat >= 1.0.64
+%endif
+
+%description jasper-eclipse
+Jasper OSGi Eclipse plugin that contains class files from jasper-compiler, 
+jasper-runtime and ECJ.
+%endif
+
 %prep
 %{__cat} << EOT
 
@@ -565,6 +582,28 @@
 popd
 %endif
 
+# create jasper-eclipse jar
+%if %{with_ecj}
+mkdir org.apache.jasper
+pushd org.apache.jasper
+unzip -qq ../apache-tomcat-5.5.23-src/build/build/common/lib/jasper-compiler.jar
+unzip -qq ../apache-tomcat-5.5.23-src/build/build/common/lib/jasper-runtime.jar \
+  -x META-INF/MANIFEST.MF org/apache/jasper/compiler/Localizer.class
+unzip -qq %{_javadir}/jdtcore.jar -x META-INF/MANIFEST.MF
+cp %{SOURCE6} META-INF/MANIFEST.MF
+rm plugin.properties plugin.xml about.html jdtCompilerAdapter.jar META-INF/eclipse.inf 
+zip -qq -r ../org.apache.jasper_5.5.17.v200706111724.jar .
+popd
+%endif
+
+# inject OSGi manifests
+mkdir META-INF
+cp %{SOURCE7} META-INF/MANIFEST.MF
+zip -u %{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar META-INF/MANIFEST.MF
+cp %{SOURCE8} META-INF/MANIFEST.MF
+zip -u %{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar META-INF/MANIFEST.MF
+
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
@@ -861,6 +900,11 @@
     --exclude var/lib/%{name}/server/lib/servlets-ssi.renametojar
 %endif
 
+%if %{with_ecj}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins
+%{__cp} org.apache.jasper_5.5.17.v200706111724.jar ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins
+%endif 
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -915,6 +959,16 @@
 %endif
 
 %if %{gcj_support}
+%post jasper-eclipse
+%{_bindir}/rebuild-gcj-db
+%endif
+
+%if %{gcj_support}
+%postun jasper-eclipse
+%{_bindir}/rebuild-gcj-db
+%endif
+
+%if %{gcj_support}
 %post server-lib
 %{_bindir}/rebuild-gcj-db
 %endif
@@ -1231,7 +1285,19 @@
 %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
+%if %{with_ecj}
+%files jasper-eclipse
+%defattr(-,root,root)
+%dir %{_datadir}/eclipse
+%dir %{_datadir}/eclipse/plugins
+%{_datadir}/eclipse/plugins/org.apache.jasper_*
+%endif
+
 %changelog
+* Mon Aug 06 2007 Ben Konrath <bkonrath at redhat.com> 0:5.5.23-9jpp.4
+- Add jasper-eclipse subpackage which is needed for eclipse 3.3.
+- Inject OSGi manifest into servlet api jar and jsp api jar.
+
 * Mon Jul 23 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:5.5.23-9jpp.3
 - Resolves: Bug 246374
 


