jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject [jspwiki] 04/05: jspwiki-portable: update bundled Apache Tomcat to 7.0.84; use latest launch4j and appbundler fork from https://github.com/teras/appbundler
Date Sun, 28 Jan 2018 00:54:44 GMT
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 8324af943286407a151202dcf036f5f2a864fb57
Author: juanpablo <juanpablo@apache.org>
AuthorDate: Sun Jan 28 01:53:04 2018 +0100

    jspwiki-portable: update bundled Apache Tomcat to 7.0.84; use latest launch4j and appbundler
fork from https://github.com/teras/appbundler
---
 jspwiki-portable/build.xml                       | 22 +++++++++++-----------
 jspwiki-portable/readme.md                       |  8 ++++++--
 jspwiki-portable/src/main/assembly/woas-dist.xml |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml
index 9296eb8..45ae7c4 100644
--- a/jspwiki-portable/build.xml
+++ b/jspwiki-portable/build.xml
@@ -26,7 +26,7 @@
   <property environment="env"/>
 
   <!-- the build version if not overwritten by the caller -->
-  <property name="jspwiki.woas.version" value="2.10.1-SNAPSHOT" />
+  <property name="jspwiki.woas.version" value="2.10.3-SNAPSHOT" />
   
   <!-- define the temporary build directory -->
   <property name="jspwiki.woas.target.dir" value="${basedir}/target" />
@@ -38,7 +38,7 @@
   <property name="jspwiki.woas.assembly.dir" value="${jspwiki.woas.target.dir}/woas" />
 
   <!-- the Tomcat version to use --> 
-  <property name="jspwiki.tomcat.version" value="7.0.52"/>
+  <property name="jspwiki.tomcat.version" value="7.0.84"/>
 
   <!-- the Tomcat distribution to use --> 
   <property name="jspwiki.tomcat.distribution" value="apache-tomcat-${jspwiki.tomcat.version}"/>
@@ -143,7 +143,7 @@
         errTitle="WikiOnAStick" 
         chdir="." 
         icon="${basedir}/src/resources/windows/jspwiki.ico"
-        jar="${basedir}/src/resources/tomcat/tomcat-launcher-7.0.52.jar"
+        jar="${basedir}/target/launchers/tomcat-launcher-${jspwiki.tomcat.version}.jar"
         >
         <singleInstance mutexName="org.apache.jspwiki.jspwiki-portable" />
         <jre minVersion="1.6.0" />
@@ -181,7 +181,7 @@
     <taskdef 
       name="bundleapp" 
       classname="com.oracle.appbundler.AppBundlerTask"
-      classpath="${jspwiki.appbundler.install.dir}/appbundler-1.0.jar" 
+      classpath="${jspwiki.appbundler.install.dir}/appbundler-1.1.0.jar" 
     />
     <delete dir="${jspwiki.woas.assembly.dir}/woas.app"/> 
     <bundleapp 
@@ -212,24 +212,24 @@
     <target name="woas:download-launch4j-for-win" description="Download the Win32 launch4j
distribution">
         <delete dir="${jspwiki.launch4j.install.dir}"/>
         <mkdir dir="${jspwiki.launch4j.install.dir}"/>
-        <get src="http://netassist.dl.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-win32.zip"
dest="${jspwiki.launch4j.install.dir}"/>
-        <unzip src="${jspwiki.launch4j.install.dir}/launch4j-3.8-win32.zip" dest="${jspwiki.launch4j.install.dir}/.."/>
-        <delete file="${jspwiki.launch4j.install.dir}/launch4j-3.8-win32.zip"/>
+        <get src="http://netassist.dl.sourceforge.net/project/launch4j/launch4j-3/3.11/launch4j-3.11-win32.zip"
dest="${jspwiki.launch4j.install.dir}"/>
+        <unzip src="${jspwiki.launch4j.install.dir}/launch4j-3.11-win32.zip" dest="${jspwiki.launch4j.install.dir}/.."/>
+        <delete file="${jspwiki.launch4j.install.dir}/launch4j-3.11-win32.zip"/>
     </target>
 
     <target name="woas:download-launch4j-for-mac" description="Download the Mac OS X launch4j
distribution">
         <delete dir="${jspwiki.launch4j.install.dir}"/>
         <mkdir dir="${jspwiki.launch4j.install.dir}"/>
-        <get src="http://netassist.dl.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-macosx-x86.tgz"
dest="${jspwiki.launch4j.install.dir}"/>
-        <untar src="${jspwiki.launch4j.install.dir}/launch4j-3.8-macosx-x86.tgz" dest="${jspwiki.launch4j.install.dir}/.."
compression="gzip"/>
-        <delete file="${jspwiki.launch4j.install.dir}/launch4j-3.8-macosx-x86.tgz"/>
+        <get src="http://netassist.dl.sourceforge.net/project/launch4j/launch4j-3/3.11/launch4j-3.11-macosx-x86.tgz"
dest="${jspwiki.launch4j.install.dir}"/>
+        <untar src="${jspwiki.launch4j.install.dir}/launch4j-3.11-macosx-x86.tgz" dest="${jspwiki.launch4j.install.dir}/.."
compression="gzip"/>
+        <delete file="${jspwiki.launch4j.install.dir}/launch4j-3.11-macosx-x86.tgz"/>
         <chmod dir="${jspwiki.launch4j.install.dir}/bin" includes="*" perm="ugo+x"/>
     </target>
 
     <target name="woas:download-appbundler-for-mac" description="Download the Mac OS X
appbundler library">
         <delete dir="${jspwiki.appbundler.install.dir}"/>
         <mkdir dir="${jspwiki.appbundler.install.dir}"/>
-        <get src="https://java.net/downloads/appbundler/appbundler-1.0.jar" dest="${jspwiki.appbundler.install.dir}"/>
+        <get src="http://search.maven.org/remotecontent?filepath=com/panayotis/appbundler/1.1.0/appbundler-1.1.0.jar"
dest="${jspwiki.appbundler.install.dir}/appbundler-1.1.0.jar"/>
     </target>
 
 </project>
diff --git a/jspwiki-portable/readme.md b/jspwiki-portable/readme.md
index ef4bcc3..3b96f01 100644
--- a/jspwiki-portable/readme.md
+++ b/jspwiki-portable/readme.md
@@ -21,7 +21,7 @@
 
 This project builds a ready-to-use JSP Wiki distribution
 
-* Based on Tomcat 7.0.52 as servlet engine
+* Based on Tomcat 7.0.84 as servlet engine
 * Using HTTP port 9627 to avoid conflicts with existing servers running on port 80 and/or
8080
 
 # 2. Creating The Native Launchers
@@ -60,6 +60,8 @@ BUILD SUCCESSFUL
 ```
 The generated "woas.exe" can be copied manually to *jspwiki-portable/src/overlay/launchers/tomcat/woas.exe*
after manual testing.
 
+note: on windows platforms, use `ant woas:download-launch4j-for-win woas:create-windows-app`
to create the launcher.
+
 ## 2.2 Creating The Mac OS X Launcher
 
 Run the following commands
@@ -81,7 +83,9 @@ woas:mac-app-oracle-jdk:
 
 BUILD SUCCESSFUL
 ```
-The generated "woas.exe" can be copied manually to *jspwiki-portable/src/overlay/launchers/tomcat/woas.exe*
after manual testing.
+The generated "woas.app" can be copied manually to *jspwiki-portable/src/overlay/launchers/tomcat/woas.app*
after manual testing.
+
+note: on windows platforms, use `ant woas:download-appbundler-for-mac woas:download-launch4j-for-mac
woas:create-mac-app`
 
 # 3. Current State
 
diff --git a/jspwiki-portable/src/main/assembly/woas-dist.xml b/jspwiki-portable/src/main/assembly/woas-dist.xml
index 8bdab06..13ee470 100644
--- a/jspwiki-portable/src/main/assembly/woas-dist.xml
+++ b/jspwiki-portable/src/main/assembly/woas-dist.xml
@@ -20,7 +20,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
   <id>woas</id>
-    <formats>
+  <formats>
     <format>tar.gz</format>
     <format>zip</format>
   </formats>

-- 
To stop receiving notification emails like this one, please contact
juanpablo@apache.org.

Mime
View raw message