[pkg-java] r12450 - trunk/glassfish/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-18 20:39:22 +0000 (Tue, 18 May 2010)
New Revision: 12450

Modified:
   trunk/glassfish/debian/build.xml
   trunk/glassfish/debian/glassfish-javaee.install
   trunk/glassfish/debian/rules
Log:
add pom for jstl.jar

Modified: trunk/glassfish/debian/build.xml
===================================================================
--- trunk/glassfish/debian/build.xml	2010-05-18 20:27:04 UTC (rev 12449)
+++ trunk/glassfish/debian/build.xml	2010-05-18 20:39:22 UTC (rev 12450)
@@ -106,6 +106,15 @@
     </copy>
   </target>
 
+  <target name="jstl-pom">
+    <property file="../appserv-jstl/build.properties"/>
+    <copy file="../appserv-jstl/jstl.pom" tofile="poms/jstl.xml">
+      <filterset>
+	<filter token="VERSION" value="${release.version}"/>
+      </filterset>
+    </copy>
+  </target>
+
   <target name="activation-pom">
     <property file="../activation/build.properties"/>
     <copy file="../activation/activation.pom" tofile="poms/activation.xml">
@@ -118,6 +127,7 @@
   <target name="pom" depends="jar" description="update all POMs">
     <antcall target="mail-pom" inheritAll="false"/>
     <antcall target="ejb-api-pom" inheritAll="false"/>
+    <antcall target="jstl-pom" inheritAll="false"/>
     <antcall target="activation-pom" inheritAll="false"/>
   </target>
 

Modified: trunk/glassfish/debian/glassfish-javaee.install
===================================================================
--- trunk/glassfish/debian/glassfish-javaee.install	2010-05-18 20:27:04 UTC (rev 12449)
+++ trunk/glassfish/debian/glassfish-javaee.install	2010-05-18 20:39:22 UTC (rev 12450)
@@ -1,2 +1 @@
 debian/tmp/usr/share/java/glassfish-javaee*
-debian/tmp/usr/share/java/glassfish-appserv-jstl*

Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules	2010-05-18 20:27:04 UTC (rev 12449)
+++ trunk/glassfish/debian/rules	2010-05-18 20:39:22 UTC (rev 12450)
@@ -40,6 +40,10 @@
 	mh_installjar -pglassfish-javaee debian/poms/ejb-api.xml \
 	  ejb-api/build/release/ejb-api.jar \
 	  /usr/share/java/glassfish-ejb-api.jar
+	mh_installpom -pglassfish-javaee debian/poms/jstl.xml
+	mh_installjar -pglassfish-javaee debian/poms/jstl.xml \
+	  publish/glassfish/lib/appserv-jstl.jar \
+	  /usr/share/java/glassfish-appserv-jstl.jar
 
 install/glassfish-activation::
 	mh_installpom -pglassfish-activation debian/poms/activation.xml