[pkg-java] r11138 - trunk/tiles/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-11-26 22:56:52 +0000 (Thu, 26 Nov 2009)
New Revision: 11138

Modified:
   trunk/tiles/debian/build.xml
   trunk/tiles/debian/changelog
   trunk/tiles/debian/libtiles-java.poms
   trunk/tiles/debian/maven.rules
   trunk/tiles/debian/rules
Log:
* New upstream release.
  - new modules: tiles-el, tiles-ognl, tiles-servlet-wildcard
* debian/maven.rules: Transform more dependencies
* debian/build.xml: Updated to build new modules

Modified: trunk/tiles/debian/build.xml
===================================================================
--- trunk/tiles/debian/build.xml	2009-11-26 22:49:37 UTC (rev 11137)
+++ trunk/tiles/debian/build.xml	2009-11-26 22:56:52 UTC (rev 11138)
@@ -30,9 +30,11 @@
     <delete dir="build"/>
     <cleanmodule dir="src/tiles-api"/>
     <cleanmodule dir="src/tiles-core"/>
+    <cleanmodule dir="src/tiles-el"/>
+    <cleanmodule dir="src/tiles-ognl"/>
     <cleanmodule dir="src/tiles-compat"/>
-    <delete dir="src/tiles-core/src/main/java/org/apache/tiles/evaluator/mvel/" />
     <cleanmodule dir="src/tiles-servlet"/>
+    <cleanmodule dir="src/tiles-servlet-wildcard"/>
     <cleanmodule dir="src/tiles-template"/>
     <cleanmodule dir="src/tiles-jsp"/>
     <cleanmodule dir="src/tiles-freemarker"/>
@@ -42,8 +44,11 @@
     <packagemodule dir="src/"/>
     <packagemodule dir="src/tiles-api"/>
     <packagemodule dir="src/tiles-core"/>
+    <packagemodule dir="src/tiles-el"/>
+    <packagemodule dir="src/tiles-ognl"/>
     <packagemodule dir="src/tiles-compat"/>
     <packagemodule dir="src/tiles-servlet"/>
+    <packagemodule dir="src/tiles-servlet-wildcard"/>
     <packagemodule dir="src/tiles-template"/>
     <packagemodule dir="src/tiles-jsp"/>
     <packagemodule dir="src/tiles-freemarker"/>
@@ -53,8 +58,11 @@
     <javadoc destdir="${javadoc.dir}">
       <packageset dir="src/tiles-api/src/main/java/"/>
       <packageset dir="src/tiles-core/src/main/java/"/>
+      <packageset dir="src/tiles-el/src/main/java/"/>
+      <packageset dir="src/tiles-ognl/src/main/java/"/>
       <packageset dir="src/tiles-compat/src/main/java/"/>
       <packageset dir="src/tiles-servlet/src/main/java/"/>
+      <packageset dir="src/tiles-servlet-wildcard/src/main/java/"/>
       <packageset dir="src/tiles-template/src/main/java/"/>
       <packageset dir="src/tiles-jsp/src/main/java/"/>
       <packageset dir="src/tiles-freemarker/src/main/java/"/>

Modified: trunk/tiles/debian/changelog
===================================================================
--- trunk/tiles/debian/changelog	2009-11-26 22:49:37 UTC (rev 11137)
+++ trunk/tiles/debian/changelog	2009-11-26 22:56:52 UTC (rev 11138)
@@ -1,3 +1,12 @@
+tiles (2.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - new modules: tiles-el, tiles-ognl, tiles-servlet-wildcard
+  * debian/maven.rules: Transform more dependencies
+  * debian/build.xml: Updated to build new modules
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 26 Nov 2009 23:55:49 +0100
+
 tiles (2.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/tiles/debian/libtiles-java.poms
===================================================================
--- trunk/tiles/debian/libtiles-java.poms	2009-11-26 22:49:37 UTC (rev 11137)
+++ trunk/tiles/debian/libtiles-java.poms	2009-11-26 22:56:52 UTC (rev 11138)
@@ -1,8 +1,11 @@
 src/pom.xml --no-parent
 src/tiles-api/pom.xml
 src/tiles-core/pom.xml
+src/tiles-el/pom.xml
+src/tiles-ognl/pom.xml
 src/tiles-compat/pom.xml
 src/tiles-servlet/pom.xml
+src/tiles-servlet-wildcard/pom.xml
 src/tiles-template/pom.xml
 src/tiles-jsp/pom.xml
 src/tiles-freemarker/pom.xml

Modified: trunk/tiles/debian/maven.rules
===================================================================
--- trunk/tiles/debian/maven.rules	2009-11-26 22:49:37 UTC (rev 11137)
+++ trunk/tiles/debian/maven.rules	2009-11-26 22:56:52 UTC (rev 11138)
@@ -1,2 +1,5 @@
-javax.servlet servlet-api jar *
 junit junit jar s/3\..*/3.x/
+org.springframework * * s/2\..*/2.x/
+javax.servlet servlet-api jar s/.*/2.5/
+javax.servlet.jsp jsp-api jar s/.*/2.1/
+javax.el el-api jar s/.*/2.1/

Modified: trunk/tiles/debian/rules
===================================================================
--- trunk/tiles/debian/rules	2009-11-26 22:49:37 UTC (rev 11137)
+++ trunk/tiles/debian/rules	2009-11-26 22:56:52 UTC (rev 11138)
@@ -13,15 +13,15 @@
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/api
 
+MODULES = api core el ognl compat servlet servlet-wildcard template jsp freemarker
+
 binary-post-install/lib$(PACKAGE)-java::
 	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l src/tiles-api/pom.xml src/tiles-api/build/tiles-api-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l src/tiles-core/pom.xml src/tiles-core/build/tiles-core-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l src/tiles-compat/pom.xml src/tiles-compat/build/tiles-compat-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l src/tiles-servlet/pom.xml src/tiles-servlet/build/tiles-servlet-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l src/tiles-template/pom.xml src/tiles-template/build/tiles-template-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l src/tiles-jsp/pom.xml src/tiles-jsp/build/tiles-jsp-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l src/tiles-freemarker/pom.xml src/tiles-freemarker/build/tiles-freemarker-$(VERSION).jar
+	for MYMOD in $(MODULES); do \
+		POM=`echo src/tiles-$$MYMOD/pom.xml` ;\
+		JAR=`echo src/tiles-$$MYMOD/build/tiles-$$MYMOD-$(VERSION).jar` ;\
+		mh_installjar -plib$(PACKAGE)-java -l $$POM $$JAR; \
+	done
 
 clean::
 	-rm -rf debian/tmp