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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2015-10-28 00:04:19 +0000 (Wed, 28 Oct 2015)
New Revision: 18871

Modified:
   trunk/tiles/debian/build.properties
   trunk/tiles/debian/build.xml
   trunk/tiles/debian/changelog
   trunk/tiles/debian/control
   trunk/tiles/debian/libtiles-java.poms
   trunk/tiles/debian/rules
Log:
Build and install the tiles-extras and tiles-velocity modules



Modified: trunk/tiles/debian/build.properties
===================================================================
--- trunk/tiles/debian/build.properties	2015-10-27 20:43:29 UTC (rev 18870)
+++ trunk/tiles/debian/build.properties	2015-10-28 00:04:19 UTC (rev 18871)
@@ -13,10 +13,19 @@
             /usr/share/java/spring3-core.jar:\
             /usr/share/java/spring3-web.jar:\
             /usr/share/java/freemarker.jar:\
+            /usr/share/java/velocity.jar:\
+            /usr/share/java/velocity-tools-view.jar:\
             ${basedir}/src/tiles-api/build/tiles-api-${version}.jar:\
             ${basedir}/src/tiles-core/build/tiles-core-${version}.jar:\
+            ${basedir}/src/tiles-compat/build/tiles-compat-${version}.jar:\
+            ${basedir}/src/tiles-el/build/tiles-el-${version}.jar:\
+            ${basedir}/src/tiles-freemarker/build/tiles-freemarker-${version}.jar:\
+            ${basedir}/src/tiles-mvel/build/tiles-mvel-${version}.jar:\
+            ${basedir}/src/tiles-ognl/build/tiles-ognl-${version}.jar:\
             ${basedir}/src/tiles-servlet/build/tiles-servlet-${version}.jar:\
-            ${basedir}/src/tiles-template/build/tiles-template-${version}.jar
+            ${basedir}/src/tiles-servlet-wildcard/build/tiles-servlet-wildcard-${version}.jar:\
+            ${basedir}/src/tiles-template/build/tiles-template-${version}.jar:\
+            ${basedir}/src/tiles-velocity/build/tiles-velocity-${version}.jar
 # Ensure that source and target are 1.5
 # For backwards compat on Java 7
 ant.build.javac.source=1.5

Modified: trunk/tiles/debian/build.xml
===================================================================
--- trunk/tiles/debian/build.xml	2015-10-27 20:43:29 UTC (rev 18870)
+++ trunk/tiles/debian/build.xml	2015-10-28 00:04:19 UTC (rev 18871)
@@ -39,6 +39,8 @@
     <cleanmodule dir="src/tiles-template"/>
     <cleanmodule dir="src/tiles-jsp"/>
     <cleanmodule dir="src/tiles-freemarker"/>
+    <cleanmodule dir="src/tiles-velocity"/>
+    <cleanmodule dir="src/tiles-extras"/>
   </target>
 
   <target name="package">
@@ -54,6 +56,8 @@
     <packagemodule dir="src/tiles-template"/>
     <packagemodule dir="src/tiles-jsp"/>
     <packagemodule dir="src/tiles-freemarker"/>
+    <packagemodule dir="src/tiles-velocity"/>
+    <packagemodule dir="src/tiles-extras"/>
   </target>
 
   <target name="javadoc">
@@ -69,6 +73,8 @@
       <packageset dir="src/tiles-template/src/main/java/"/>
       <packageset dir="src/tiles-jsp/src/main/java/"/>
       <packageset dir="src/tiles-freemarker/src/main/java/"/>
+      <packageset dir="src/tiles-velocity/src/main/java/"/>
+      <packageset dir="src/tiles-extras/src/main/java/"/>
     </javadoc>
   </target>
 

Modified: trunk/tiles/debian/changelog
===================================================================
--- trunk/tiles/debian/changelog	2015-10-27 20:43:29 UTC (rev 18870)
+++ trunk/tiles/debian/changelog	2015-10-28 00:04:19 UTC (rev 18871)
@@ -1,3 +1,10 @@
+tiles (2.2.2-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build and install the tiles-extras and tiles-velocity modules
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Oct 2015 23:50:51 +0100
+
 tiles (2.2.2-5) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/tiles/debian/control
===================================================================
--- trunk/tiles/debian/control	2015-10-27 20:43:29 UTC (rev 18870)
+++ trunk/tiles/debian/control	2015-10-28 00:04:19 UTC (rev 18871)
@@ -6,7 +6,7 @@
 Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-ant-helper
 Build-Depends-Indep: libcommons-digester-java, libslf4j-java, libognl-java,
  libservlet2.5-java, libtomcat8-java, libspring-core-java, libspring-web-java,
- libfreemarker-java, maven-repo-helper, libmvel-java
+ libfreemarker-java, maven-repo-helper, libmvel-java, libvelocity-tools-java
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/tiles/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/tiles/
@@ -16,7 +16,7 @@
 Architecture: all
 Depends: ${misc:Depends}, libcommons-digester-java, libslf4j-java
 Suggests: libognl-java, libtomcat8-java, libfreemarker-java,
- libspring-core-java, libspring-web-java, libmvel-java
+ libspring-core-java, libspring-web-java, libmvel-java, libvelocity-tools-java
 Description: Java templating framework for web application user interfaces
  Apache Tiles is a Java templating framework built to simplify the development
  of web application user interfaces. Tiles allows authors to define page

Modified: trunk/tiles/debian/libtiles-java.poms
===================================================================
--- trunk/tiles/debian/libtiles-java.poms	2015-10-27 20:43:29 UTC (rev 18870)
+++ trunk/tiles/debian/libtiles-java.poms	2015-10-28 00:04:19 UTC (rev 18871)
@@ -2,6 +2,7 @@
 src/tiles-api/pom.xml
 src/tiles-core/pom.xml
 src/tiles-el/pom.xml
+src/tiles-extras/pom.xml
 src/tiles-ognl/pom.xml
 src/tiles-mvel/pom.xml
 src/tiles-compat/pom.xml
@@ -10,3 +11,4 @@
 src/tiles-template/pom.xml
 src/tiles-jsp/pom.xml
 src/tiles-freemarker/pom.xml
+src/tiles-velocity/pom.xml

Modified: trunk/tiles/debian/rules
===================================================================
--- trunk/tiles/debian/rules	2015-10-27 20:43:29 UTC (rev 18870)
+++ trunk/tiles/debian/rules	2015-10-28 00:04:19 UTC (rev 18871)
@@ -13,7 +13,7 @@
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/api
 
-MODULES = api core el ognl mvel compat servlet servlet-wildcard template jsp freemarker
+MODULES = api core el extras ognl mvel compat servlet servlet-wildcard template jsp freemarker velocity
 
 binary-post-install/lib$(PACKAGE)-java::
 	mh_installpoms -plib$(PACKAGE)-java