You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/01/03 00:30:10 UTC
[09/10] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e1352edd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e1352edd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e1352edd
Branch: refs/heads/2.3
Commit: e1352eddfdb900eb4a693a4cbf23fe8bc1379fba
Parents: c7f2ad6 31690f6
Author: ddekany <dd...@apache.org>
Authored: Sun Jan 3 00:01:26 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Jan 3 00:28:14 2016 +0100
----------------------------------------------------------------------
build.properties.sample | 3 +-
build.xml | 245 +-
src/examples/README.txt | 39 -
src/examples/ant/README.txt | 24 -
src/examples/ant/build.xml | 34 -
src/examples/ant/src/template/faq2html.ftl | 51 -
src/examples/ant/src/xml/faq.xml | 221 --
.../WEB-INF/classes/example/AddAction.java | 45 -
.../example/ApplicationResources.properties | 22 -
.../WEB-INF/classes/example/FormAction.java | 37 -
.../classes/example/GuestbookAction.java | 34 -
.../classes/example/GuestbookActionServlet.java | 39 -
.../WEB-INF/classes/example/GuestbookEntry.java | 45 -
.../classes/example/GuestbookEntryForm.java | 73 -
.../WEB-INF/classes/example/IndexAction.java | 42 -
.../struts-webapp/WEB-INF/struts-config.xml | 60 -
.../struts-webapp/WEB-INF/struts-html.tld | 2934 ------------------
src/examples/struts-webapp/WEB-INF/web.xml | 125 -
src/examples/struts-webapp/add.ftl | 32 -
src/examples/struts-webapp/form.ftl | 39 -
src/examples/struts-webapp/help.html | 43 -
src/examples/struts-webapp/index.ftl | 41 -
src/examples/struts-webapp/lib/common.ftl | 39 -
src/examples/struts-webapp/poweredby_ffffff.png | Bin 2775 -> 0 bytes
.../WEB-INF/classes/example/HelloServlet.java | 80 -
src/examples/webapp1/WEB-INF/templates/test.ftl | 26 -
src/examples/webapp1/WEB-INF/web.xml | 38 -
src/examples/webapp1/help.html | 39 -
.../classes/example/ControllerServlet.java | 148 -
.../WEB-INF/classes/example/GuestbookEntry.java | 45 -
.../classes/example/GuestbookServlet.java | 97 -
.../webapp2/WEB-INF/classes/example/Page.java | 67 -
src/examples/webapp2/WEB-INF/templates/add.ftl | 32 -
src/examples/webapp2/WEB-INF/templates/form.ftl | 44 -
.../webapp2/WEB-INF/templates/index.ftl | 42 -
.../webapp2/WEB-INF/templates/lib/common.ftl | 39 -
src/examples/webapp2/WEB-INF/web.xml | 38 -
src/examples/webapp2/help.html | 84 -
src/examples/webapp2/poweredby_ffffff.png | Bin 2775 -> 0 bytes
39 files changed, 117 insertions(+), 4969 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e1352edd/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index fa4821c,c957988..6e96f8d
--- a/build.xml
+++ b/build.xml
@@@ -727,17 -652,10 +652,10 @@@
<fileset dir="build/api" />
</copy>
- <!-- Package -->
- <property name="bin.tar" value="build/dist/apache-freemarker-${version}-bin.tar" />
- <property name="bin.gzip" value="${bin.tar}.gz" />
- <delete file="${bin.tar}" />
- <tar tarfile="${bin.tar}" basedir="${dist.dir}/bin" />
- <delete file="${bin.gzip}" />
- <gzip zipfile="${bin.gzip}" src="${bin.tar}" />
- <delete file="${bin.tar}" />
-
- <!-- Sign and hash: -->
- <!-- TODO -->
+ <u:packageAndSignDist
+ srcDir="${dist.dir}/bin"
- archiveNameWithoutExt="apache-freemarker-gae-${version}-bin"
++ archiveNameWithoutExt="apache-freemarker-${version}-bin"
+ />
<!-- ..................................... -->
<!-- Source distribution -->
@@@ -777,19 -695,60 +695,60 @@@
</fileset>
</copy>
- <!-- Package -->
- <property name="src.tar" value="build/dist/apache-freemarker-${version}-src.tar" />
- <property name="src.gzip" value="${src.tar}.gz" />
- <delete file="${src.tar}" />
- <tar tarfile="${src.tar}" basedir="${dist.dir}/src" />
- <delete file="${src.gzip}" />
- <gzip zipfile="${src.gzip}" src="${src.tar}" />
- <delete file="${src.tar}" />
-
- <!-- Sign and hash: -->
- <!-- TODO -->
+ <u:packageAndSignDist
+ srcDir="${dist.dir}/src"
- archiveNameWithoutExt="apache-freemarker-gae-${version}-src"
++ archiveNameWithoutExt="apache-freemarker-${version}-src"
+ />
</target>
+ <macrodef name="packageAndSignDist" uri="http://freemarker.org/util">
+ <attribute name="srcDir" />
+ <attribute name="archiveNameWithoutExt" />
+ <sequential>
+ <local name="archive.tar"/>
+ <property name="archive.tar" value="build/dist/@{archiveNameWithoutExt}.tar" />
+ <local name="archive.gzip"/>
+ <property name="archive.gzip" value="${archive.tar}.gz" />
+ <delete file="${archive.tar}" />
+ <tar tarfile="${archive.tar}" basedir="@{srcDir}" />
+ <delete file="${archive.gzip}" />
+ <gzip zipfile="${archive.gzip}" src="${archive.tar}" />
+ <delete file="${archive.tar}" />
+
+ <echo>Signing "${archive.gzip}"...</echo>
+ <!-- gpg may hang if it exists: -->
+ <delete file="${archive.gzip}.asc" />
+ <exec executable="${gpgCommand}" failonerror="true">
+ <arg value="--armor" />
+ <arg value="--output" />
+ <arg value="${archive.gzip}.asc" />
+ <arg value="--detach-sig" />
+ <arg value="${archive.gzip}" />
+ </exec>
+
+ <echo>*** Signature verification: ***</echo>
+ <exec executable="${gpgCommand}" failonerror="true">
+ <arg value="--verify" />
+ <arg value="${archive.gzip}.asc" />
+ <arg value="${archive.gzip}" />
+ </exec>
+ <local name="signatureGood" />
+ <local name="signatureGood.y" />
+ <input
+ validargs="y,n"
+ addproperty="signatureGood"
+ >Is the above signer the intended one for Apache releases?</input>
+ <condition property="signatureGood.y">
+ <equals arg1="y" arg2="${signatureGood}"/>
+ </condition>
+ <fail unless="signatureGood.y" message="Task aborted by user." />
+
+ <echo>Creating checksum files for "${archive.gzip}"...</echo>
+ <checksum file="${archive.gzip}" fileext=".md5" algorithm="MD5" forceOverwrite="yes" />
+ <checksum file="${archive.gzip}" fileext=".sha512" algorithm="SHA-512" forceOverwrite="yes" />
+ </sequential>
+ </macrodef>
+
<target name="maven-pom">
<echo file="build/pom.xml"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<!--
@@@ -828,8 -787,9 +787,8 @@@
<packaging>jar</packaging>
- <name>FreeMarker</name>
+ <name>Apache FreeMarker</name>
<description>
- Google App Engine compliant variation of FreeMarker.
FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
</description>
<url>http://freemarker.org/</url>