packages: tomcat/tomcat-build.properties, tomcat/tomcat.spec - build proper...

[pawelz]

Author: pawelz                       Date: Fri Oct 23 09:15:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build property tomcat-jdt.jar must point to jar that contains eclipse jdt.
  The problem was it pointed to itself (/usr/share/java/jasper-compiler-jdt).
  It means, that orc.eclipse.jdt classes from previous tomcat version was
  repackaged to new tomcat version. This is why these classes were older then
  tomcat. In fact they were never updated. Now this property points to
  /usr/share/java/org.eclipse.jdt.core.jar, so tomcat will use the newest
  available eclipse jdt.
- reported by zawadaa, thanks
- rel 4

---- Files affected:
packages/tomcat:
   tomcat-build.properties (1.2 -> 1.3) , tomcat.spec (1.138 -> 1.139) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat-build.properties
diff -u packages/tomcat/tomcat-build.properties:1.2 packages/tomcat/tomcat-build.properties:1.3
--- packages/tomcat/tomcat-build.properties:1.2	Tue Aug 18 17:40:11 2009
+++ packages/tomcat/tomcat-build.properties	Fri Oct 23 11:15:52 2009
@@ -42,7 +42,7 @@
 
 ant.jar=${rpm.javadir}/ant.jar
 jdt.jar=${rpm.javadir}/org.eclipse.jdt.core.jar
-jasper-jdt.jar=${rpm.javadir}/jasper-compiler-jdt.jar
+jasper-jdt.jar=${rpm.javadir}/org.eclipse.jdt.core.jar
 
 tomcat-dbcp.jar=${rpm.javadir}/commons-dbcp-tomcat5.jar
 commons-pool.home=${rpm.javadir}/commons-pool-1.4-src

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.138 packages/tomcat/tomcat.spec:1.139
--- packages/tomcat/tomcat.spec:1.138	Thu Oct 22 16:00:55 2009
+++ packages/tomcat/tomcat.spec	Fri Oct 23 11:15:52 2009
@@ -13,7 +13,7 @@
 Summary(pl.UTF-8):	Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:		tomcat
 Version:	6.0.20
-Release:	3
+Release:	4
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -166,6 +166,7 @@
 Summary(pl.UTF-8):	Kompilator JSP
 Group:		Libraries/Java
 Requires:	jpackage-utils
+Requires:	eclipse-jdt >= 3.2
 Obsoletes:	apache-tomcat-jasper
 
 %description jasper
@@ -267,7 +268,7 @@
 	ln -sf $jar $TOMCATDIR/bin
 done
 
-jars="commons-pool-tomcat5 commons-dbcp-tomcat5 mysql-connector-java"
+jars="commons-pool-tomcat5 commons-dbcp-tomcat5 mysql-connector-java org.eclipse.jdt.core"
 for jar in $jars; do
 	jar=$(find-jar $jar)
 	ln -sf $jar $TOMCATDIR/lib
@@ -282,7 +283,6 @@
 ln -s servlet-api-%{servletapiver}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
 
 # XXX add softlinks jasper-compiler.jar and jasper-runtime for compatibility with tomcat 5.5?
-ln -sf %{_javadir}/jasper-compiler-jdt.jar $TOMCATDIR/lib
 ln -sf %{_javadir}/jasper-el.jar $TOMCATDIR/lib
 ln -sf %{_javadir}/jasper.jar $TOMCATDIR/lib
 
@@ -342,9 +342,6 @@
 %{_tomcatdir}/lib/commons-dbcp-tomcat5.jar
 %{_tomcatdir}/lib/commons-pool-tomcat5.jar
 %{_tomcatdir}/lib/el-api.jar
-%{_tomcatdir}/lib/jasper-compiler-jdt.jar
-%{_tomcatdir}/lib/jasper-el.jar
-%{_tomcatdir}/lib/jasper.jar
 %{_tomcatdir}/lib/jsp-api-2.1.jar
 %{_tomcatdir}/lib/mysql-connector-java.jar
 %{_tomcatdir}/lib/servlet-api-2.5.jar
@@ -406,9 +403,11 @@
 
 %files jasper
 %defattr(644,root,root,755)
-%{_javadir}/jasper-compiler-jdt.jar
 %{_javadir}/jasper-el.jar
 %{_javadir}/jasper.jar
+%{_tomcatdir}/lib/jasper-el.jar
+%{_tomcatdir}/lib/jasper.jar
+%{_tomcatdir}/lib/org.eclipse.jdt.core.jar
 
 %files -n java-servletapi
 %defattr(644,root,root,755)
@@ -421,6 +420,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139  2009/10/23 09:15:52  pawelz
+- build property tomcat-jdt.jar must point to jar that contains eclipse jdt.
+  The problem was it pointed to itself (/usr/share/java/jasper-compiler-jdt).
+  It means, that orc.eclipse.jdt classes from previous tomcat version was
+  repackaged to new tomcat version. This is why these classes were older then
+  tomcat. In fact they were never updated. Now this property points to
+  /usr/share/java/org.eclipse.jdt.core.jar, so tomcat will use the newest
+  available eclipse jdt.
+- reported by zawadaa, thanks
+- rel 4
+
 Revision 1.138  2009/10/22 14:00:55  pawelz
 - added mysql-connector-jara.jar to %files
 - sorted %files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.properties?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.138&r2=1.139&f=u