You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by sg...@apache.org on 2014/12/08 15:37:10 UTC
svn commit: r1643826 [1/3] - in /jspwiki/trunk: ./ jspwiki-portable/
jspwiki-portable/src/main/assembly/ jspwiki-portable/src/main/resources/
jspwiki-portable/src/overlay/ jspwiki-portable/src/overlay/launchers/
jspwiki-portable/src/overlay/launchers/t...
Author: sgoeschl
Date: Mon Dec 8 14:37:08 2014
New Revision: 1643826
URL: http://svn.apache.org/r1643826
Log:
JSPWIKI-829 - [Portable] Integrate jspwiki-portable into the jspwiki maven build
Added:
jspwiki/trunk/jspwiki-portable/src/main/assembly/
jspwiki/trunk/jspwiki-portable/src/main/assembly/woas-dist.xml
jspwiki/trunk/jspwiki-portable/src/overlay/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Info.plist
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/MacOS/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/MacOS/JavaApplicationStub (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/PkgInfo
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/Java/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/Java/tomcat-launcher-7.0.52.jar (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/jspwiki.icns (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-launcher-7.0.52.jar (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/PkgInfo
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/PlugIns/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/en.lproj/
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/en.lproj/Localizable.strings
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/jspwiki.icns (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.bat
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.sh (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.url
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/catalina.properties
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/server.xml
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/web.xml
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/background.gif (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/images/
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/images/jspwiki.png (with props)
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/index.html
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/style.css
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/template/
jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/template/style.css
jspwiki/trunk/jspwiki-portable/src/overlay/woas/
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/private/
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/private/WEB-INF/
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/private/WEB-INF/classes/
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/private/WEB-INF/classes/jspwiki-custom.properties
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/classes/
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/classes/jspwiki-custom.properties
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/jspwiki.policy
jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/userdatabase.xml
jspwiki/trunk/jspwiki-portable/src/resources/
jspwiki/trunk/jspwiki-portable/src/resources/appbundler/
jspwiki/trunk/jspwiki-portable/src/resources/appbundler/appbundler-1.0.jar (with props)
jspwiki/trunk/jspwiki-portable/src/resources/jarbundler/
jspwiki/trunk/jspwiki-portable/src/resources/jarbundler/jarbundler-2.2.0.jar (with props)
jspwiki/trunk/jspwiki-portable/src/resources/jspwiki.png (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/bin/
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/bin/COPYING
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/bin/ld.exe (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/bin/windres.exe (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/head/
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/head/LICENSE.txt
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/head/consolehead.o (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/head/guihead.o (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/head/head.o (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/launch4j-3.1.0-beta2.jar (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/manifest/
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/manifest/uac.exe.manifest
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/MinGW.LICENSE.txt
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/crt2.o (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/libadvapi32.a (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/libgcc.a (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/libkernel32.a (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/libmingw32.a (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/libmsvcrt.a (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/libshell32.a (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/w32api/libuser32.a (with props)
jspwiki/trunk/jspwiki-portable/src/resources/launch4j/xstream.jar (with props)
jspwiki/trunk/jspwiki-portable/src/resources/macos/
jspwiki/trunk/jspwiki-portable/src/resources/macos/JavaApplicationStub (with props)
jspwiki/trunk/jspwiki-portable/src/resources/macos/jspwiki.icns (with props)
jspwiki/trunk/jspwiki-portable/src/resources/tomcat/
jspwiki/trunk/jspwiki-portable/src/resources/tomcat/tomcat-launcher-7.0.52.jar (with props)
jspwiki/trunk/jspwiki-portable/src/resources/windows/
jspwiki/trunk/jspwiki-portable/src/resources/windows/jspwiki.ico (with props)
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-portable/build.xml
jspwiki/trunk/jspwiki-portable/pom.xml
jspwiki/trunk/jspwiki-portable/readme.md
jspwiki/trunk/jspwiki-portable/src/main/resources/jspwiki-custom.properties
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1643826&r1=1643825&r2=1643826&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Mon Dec 8 14:37:08 2014
@@ -1,3 +1,7 @@
+2014-12-08 Siegfried Goeschl (sgoeschl@apache.org)
+
+ * Fixed JSPWIKI-829 - [Portable] Integrate jspwiki-portable into the jspwiki maven build
+
2014-11-04 Harry Metske (metskem@apache.org)
* 2.10.2-svn-9
Modified: jspwiki/trunk/jspwiki-portable/build.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/build.xml?rev=1643826&r1=1643825&r2=1643826&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/build.xml (original)
+++ jspwiki/trunk/jspwiki-portable/build.xml Mon Dec 8 14:37:08 2014
@@ -1,64 +1,230 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project name="woas" basedir=".">
-
- <target name="woas:app" description="creates an application wrapper">
- <echo message="copying files to ${portable.env} (launch4j expects that dir/files structure)" />
- <copy todir="${portable.env}" >
- <fileset dir="./target/launch4j" includes="*.jar"/>
- </copy>
-
- <taskdef name="launch4j"
- classname="net.sf.launch4j.ant.Launch4jTask"
- classpath="${portable.env}/launch4j-maven-plugin-1.5.2.jar:${portable.env}/xstream-1.3.1.jar" />
-
- <launch4j bindir="${portable.env}/bin">
- <config headerType="console"
- jar="./target/${maven.artifactId}-${maven.version}.jar"
- outfile="./target/${portable.exec-name}"
- errTitle="JSPWiki"
- chdir="."
- customProcName="true"
- icon="./src/main/config/jspwiki.ico" >
- <singleInstance mutexName="org.apache.jspwiki.portable" />
- <jre minVersion="1.6.0" />
- <versionInfo
- fileVersion="1.0.0.0"
- txtFileVersion="JSPWiki ${maven.version}"
- fileDescription="JSPWikiOnAStick"
- copyright="Apache Software License 2.0"
- productVersion="1.0.0.0"
- txtProductVersion="JSPWiki ${maven.version}"
- productName="JSPWikiOnAStick"
- companyName="ASF"
- internalName="jspwiki"
- originalFilename="jspwiki.exe" />
- </config>
- </launch4j>
- </target>
-
- <target name="woas:windows-app" description="creates an application wrapper">
- <property name="portable.env" value="./target/launch4j/launch4j-maven-plugin-1.5.2-workdir-win32" />
- <property name="portable.exec-name" value="jspwiki.exe" />
- <antcall inheritRefs="true" inheritall="true">
- <target name="woas:app" />
- </antcall>
- </target>
-
-</project>
\ No newline at end of file
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ This project builds a "WikiOnAStick" based on JSPWiki.
+-->
+<project name="woas" default="woas:info" basedir=".">
+
+ <!-- import environment variables -->
+ <property environment="env"/>
+
+ <!-- the build version if not overwritten by the caller -->
+ <property name="jspwiki.woas.version" value="2.10.1-SNAPSHOT" />
+
+ <!-- define the temporary build directory -->
+ <property name="jspwiki.woas.target.dir" value="${basedir}/target" />
+
+ <!-- the temporary directory for the build -->
+ <property name="jspwiki.woas.unpack.dir" value="${jspwiki.woas.target.dir}/unpack" />
+
+ <!-- the directory where to build the exploded application -->
+ <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"/>
+
+ <!-- the Tomcat distribution to use -->
+ <property name="jspwiki.tomcat.distribution" value="apache-tomcat-${jspwiki.tomcat.version}"/>
+
+ <!-- ############################################################## -->
+ <!-- General Targets -->
+ <!-- ############################################################## -->
+
+ <target name="info" description="builds the project">
+ <echo>jspwiki.woas.version = ${jspwiki.woas.version}</echo>
+ <echo>jspwiki.woas.assembly.dir = ${jspwiki.woas.assembly.dir}</echo>
+ <echo>jspwiki.woas.unpack.dir = ${jspwiki.woas.unpack.dir}</echo>
+ <echo>jspwiki.tomcat.distribution = ${jspwiki.tomcat.distribution}</echo>
+ </target>
+
+ <!-- ############################################################## -->
+ <!-- Misc -->
+ <!-- ############################################################## -->
+
+ <target name="woas:copy-woas" description="Prepares a customized JSPWiki installation">
+ <!-- copy the exploded war for the "private" wiki -->
+ <copy todir="${jspwiki.woas.assembly.dir}/webapps/private" overwrite="true">
+ <fileset dir="${jspwiki.woas.unpack.dir}/jspwiki-war/"/>
+ </copy>
+ <delete dir="${jspwiki.woas.assembly.dir}/webapps/private/WEB-INF/lib"/>
+ <!-- copy the exploded war for the "public" wiki -->
+ <copy todir="${jspwiki.woas.assembly.dir}/webapps/public" overwrite="true">
+ <fileset dir="${jspwiki.woas.unpack.dir}/jspwiki-war/"/>
+ </copy>
+ <!-- overlay the custom configuration for JSPWiki -->
+ <copy todir="${jspwiki.woas.assembly.dir}" overwrite="true">
+ <fileset dir="${basedir}/src/overlay/woas"/>
+ </copy>
+ <delete dir="${jspwiki.woas.assembly.dir}/webapps/public/WEB-INF/lib"/>
+ </target>
+
+ <!-- ############################################################## -->
+ <!-- Tomcat 7 Distribution -->
+ <!-- ############################################################## -->
+
+ <target name="woas:copy-tomcat-7" description="Prepares an unpacked Tomcat 7 deployment">
+ <!-- copy the stuff to the assembly directory -->
+ <copy todir="${jspwiki.woas.assembly.dir}">
+ <fileset dir="${jspwiki.woas.unpack.dir}/tomcat/${jspwiki.tomcat.distribution}"/>
+ </copy>
+ <!-- delete some undesired Tomcat stuff -->
+ <delete dir="${jspwiki.woas.assembly.dir}/webapps/docs"/>
+ <delete dir="${jspwiki.woas.assembly.dir}/webapps/examples"/>
+ <delete dir="${jspwiki.woas.assembly.dir}/webapps/host-manager"/>
+ <delete dir="${jspwiki.woas.assembly.dir}/webapps/manager"/>
+ <delete dir="${jspwiki.woas.assembly.dir}/webapps/ROOT"/>
+ <!-- create a work dir for JSPs - see http://jetty.4.n6.nabble.com/jetty-users-How-to-change-the-extracted-directory-td4501308.html -->
+ <mkdir dir ="${jspwiki.woas.assembly.dir}/work"/>
+ <!-- create a temp dir -->
+ <mkdir dir ="${jspwiki.woas.assembly.dir}/temp"/>
+ <!-- copy customized Tomcat configuration data -->
+ <copy todir="${jspwiki.woas.assembly.dir}" overwrite="true">
+ <fileset dir="${basedir}/src/overlay/tomcat"/>
+ </copy>
+ <!-- copy the JSPWiki libraries to tomcat -->
+ <copy todir="${jspwiki.woas.assembly.dir}/jspwiki/lib" overwrite="true">
+ <fileset dir="${jspwiki.woas.unpack.dir}/jspwiki-war/WEB-INF/lib"/>
+ </copy>
+ <!-- make the start scripts executable -->
+ <chmod dir="${jspwiki.woas.assembly.dir}" includes="*.sh" perm="ugo+x"/>
+ <chmod dir="${jspwiki.woas.assembly.dir}/bin" includes="*.sh" perm="ugo+x"/>
+ </target>
+
+ <target name="woas:copy-tomcat-7-launchers" description="Copies the existing native launchers">
+ <copy todir="${jspwiki.woas.assembly.dir}" overwrite="true">
+ <fileset dir="${basedir}/src/overlay/launchers/tomcat"/>
+ </copy>
+ <!-- make the shell scripts executable -->
+ <chmod dir="${jspwiki.woas.assembly.dir}/bin" includes="*.sh" perm="ugo+x"/>
+ <chmod dir="${jspwiki.woas.assembly.dir}" includes="*.sh" perm="ugo+x"/>
+ <!-- make the Mac OS X stub executable -->
+ <chmod file="${jspwiki.woas.assembly.dir}/woas.app/Contents/MacOS/*" perm="ugo+x"/>
+ <chmod file="${jspwiki.woas.assembly.dir}/woas-apple-jdk.app/Contents/MacOS/*" perm="ugo+x"/>
+ </target>
+
+ <!-- ############################################################## -->
+ <!-- Windows Native Launcher -->
+ <!-- ############################################################## -->
+
+ <target name="woas:windows-app" description="creates an windows application wrapper">
+ <taskdef
+ name="launch4j"
+ classname="net.sf.launch4j.ant.Launch4jTask"
+ classpath="${basedir}/src/resources/launch4j/launch4j-3.1.0-beta2.jar:${basedir}/src/resources/launch4j/xstream.jar"
+ />
+ <launch4j>
+ <config
+ headerType="console"
+ outfile="${jspwiki.woas.assembly.dir}/woas.exe"
+ errTitle="WikiOnAStick"
+ chdir="."
+ icon="${basedir}/src/resources/windows/jspwiki.ico"
+ jar="${basedir}/src/resources/tomcat/tomcat-launcher-7.0.52.jar"
+ >
+ <singleInstance mutexName="org.apache.jspwiki.jspwiki-portable" />
+ <jre minVersion="1.6.0" />
+ <versionInfo
+ fileVersion="2.1.10.1"
+ txtFileVersion="JSPWiki ${jspwiki.woas.version}"
+ fileDescription="WikiOnAStick"
+ copyright="Apache Software Licence 2.0"
+ productVersion="2.1.10.1"
+ txtProductVersion="JSPWiki ${jspwiki.woas.version}"
+ productName="WikiOnAStick"
+ companyName="Apache Software Foundation"
+ internalName="woas"
+ originalFilename="woas.exe"
+ />
+ </config>
+ </launch4j>
+ </target>
+
+ <!-- ############################################################## -->
+ <!-- Mac OS X Native Launcher -->
+ <!-- ############################################################## -->
+
+ <target name="woas:mac-app">
+ <antcall target="woas:mac-app-apple-jdk"/>
+ <antcall target="woas:mac-app-oracle-jdk"/>
+ </target>
+
+ <!--
+ Mac OS Java 6 Launcher - it uses the Apple JDK which should be available on the box
+ -->
+ <target name="woas:mac-app-apple-jdk" description="creates an Mac OS X application wrapper for Apple JDK 1.6+">
+ <echo>Building Mac OS X launcher for Apple JDK</echo>
+ <typedef
+ name="jarbundler"
+ classname="net.sourceforge.jarbundler.JarBundler"
+ classpath="${basedir}/src/resources/jarbundler/jarbundler-2.2.0.jar"
+ />
+ <delete dir="${jspwiki.woas.assembly.dir}/woas-apple-jdk.app"/>
+ <jarbundler
+ dir="${jspwiki.woas.assembly.dir}"
+ name="woas-apple-jdk"
+ mainclass="org.apache.catalina.startup.Bootstrap"
+ icon="${basedir}/src/resources/macos/jspwiki.icns"
+ jvmversion="1.6+"
+ stubfile="${basedir}/src/resources/macos/JavaApplicationStub"
+ version="${jspwiki.woas.version}"
+ vmoptions="-Xmx96m"
+ infostring="JSPWiki ${jspwiki.woas.version}">
+ <jarfileset dir="${basedir}/src/resources/tomcat">
+ <include name="tomcat-launcher-7.0.52.jar" />
+ </jarfileset>
+ </jarbundler>
+ <chmod file="${jspwiki.woas.assembly.dir}/woas-apple-jdk.app/Contents/MacOS/WikiOnAStick" perm="ugo+x"/>
+ </target>
+
+ <!--
+ See the following resources:
+ http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/packagingAppsForMac.html
+ https://java.net/downloads/appbundler/appbundler.html
+ -->
+ <target name="woas:mac-app-oracle-jdk" description="creates an Mac OS X application wrapper for Oracle JDK 1.7+">
+ <echo>Building Mac OS X launcher for Oracle JDK</echo>
+ <taskdef
+ name="bundleapp"
+ classname="com.oracle.appbundler.AppBundlerTask"
+ classpath="${basedir}/src/resources/appbundler/appbundler-1.0.jar"
+ />
+ <delete dir="${jspwiki.woas.assembly.dir}/woas.app"/>
+ <bundleapp
+ outputdirectory="${jspwiki.woas.assembly.dir}"
+ name="woas"
+ copyright="Apache Software Licence 2.0"
+ displayname="Portable JSPWiki"
+ identifier="org.apache.jspwiki.jspwiki-portable"
+ icon="${basedir}/src/resources/macos/jspwiki.icns"
+ shortversion="${jspwiki.woas.version}"
+ applicationCategory="public.app-category.developer-tools"
+ mainclassname="org.apache.catalina.startup.Bootstrap">
+ <classpath file="${basedir}/target/unpack/tomcat/${jspwiki.tomcat.distribution}/bin/bootstrap.jar"/>
+ <classpath file="${basedir}/target/unpack/tomcat/${jspwiki.tomcat.distribution}/bin/tomcat-juli.jar"/>
+ <option value="-Xmx96m"/>
+ <option value="-Duser.dir=$APP_ROOT/.."/>
+ <option value="-Dcatalina.home=$APP_ROOT/.."/>
+ <option value="-Dcatalina.base=$APP_ROOT/.."/>
+ <option value="-Djava.io.tmpdir=$APP_ROOT/../temp"/>
+ </bundleapp>
+ <chmod file="${jspwiki.woas.assembly.dir}/woas.app/Contents/MacOS/JavaAppLauncher" perm="ugo+x"/>
+ </target>
+
+</project>
Modified: jspwiki/trunk/jspwiki-portable/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/pom.xml?rev=1643826&r1=1643825&r2=1643826&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/pom.xml (original)
+++ jspwiki/trunk/jspwiki-portable/pom.xml Mon Dec 8 14:37:08 2014
@@ -1,175 +1,205 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-builder</artifactId>
- <version>2.10.1-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-portable</artifactId>
- <name>Apache JSPWiki portable</name>
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <executions>
- <execution>
- <id>unzip-workdirs</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
- <artifactId>launch4j-maven-plugin</artifactId>
- <version>1.5.2</version>
- <type>maven-plugin</type>
- <classifier>workdir-linux</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
- <artifactId>launch4j-maven-plugin</artifactId>
- <version>1.5.2</version>
- <type>maven-plugin</type>
- <classifier>workdir-mac</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
- <artifactId>launch4j-maven-plugin</artifactId>
- <version>1.5.2</version>
- <type>maven-plugin</type>
- <classifier>workdir-solaris</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
- <artifactId>launch4j-maven-plugin</artifactId>
- <version>1.5.2</version>
- <type>maven-plugin</type>
- <classifier>workdir-win32</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/launch4j</outputDirectory>
- </configuration>
- </execution>
-
- <execution>
- <id>grab-needed-libs</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
- <artifactId>launch4j-maven-plugin</artifactId>
- <version>1.5.2</version>
- <type>maven-plugin</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/launch4j</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version><!-- 2.1 not affected by https://issues.apache.org/jira/browse/MTOMCAT-211 -->
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>exec-war-only</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <charset>${project.build.sourceEncoding}</charset>
- <enableNaming>true</enableNaming>
- <extraResources>
- <extraResource>
- <directory>./src/main/resources</directory>
- <includes>
- <include>jspwiki-custom.properties</include>
- </includes>
- </extraResource>
- </extraResources>
- <finalName>${project.artifactId}-${project.version}.jar</finalName>
- <server>tomcat</server>
- <url>http://localhost:8080/manager/text</url>
- <warRunDependencies>
- <warRunDependency>
- <contextPath>/JSPWiki</contextPath>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>jspwiki-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- </warRunDependency>
- </warRunDependencies>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>launch4j</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <target>
- <property name="maven.artifactId" value="${project.artifactId}" />
- <property name="maven.version" value="${project.version}" />
-
- <ant antfile="${project.basedir}/build.xml" inheritRefs="true" inheritall="true">
- <target name="woas:windows-app" />
- </ant>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki</groupId>
+ <artifactId>jspwiki-builder</artifactId>
+ <version>2.10.2-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-portable</artifactId>
+ <name>Apache JSPWiki portable</name>
+
+ <properties>
+ <jspwiki.woas.language>en</jspwiki.woas.language>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/logs</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>woas:copy-woas</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <property name="jspwiki.woas.version" value="${project.version}"/>
+ <ant antfile="${basedir}/build.xml" target="info"/>
+ <ant antfile="${basedir}/build.xml" target="woas:copy-woas"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>woas:copy-tomcat-7</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <property name="jspwiki.woas.version" value="${project.version}"/>
+ <ant antfile="${basedir}/build.xml" target="woas:copy-tomcat-7"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>woas:copy-launchers</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <property name="jspwiki.woas.version" value="${project.version}"/>
+ <ant antfile="${basedir}/build.xml" target="info"/>
+ <ant antfile="${basedir}/build.xml" target="woas:copy-tomcat-7-launchers"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <!-- Unpack the JSP Wiki web archive -->
+ <execution>
+ <id>unpack-jspwiki-war</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.jspwiki</groupId>
+ <artifactId>jspwiki-war</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/unpack/jspwiki-war</outputDirectory>
+ </configuration>
+ </execution>
+ <!-- Unpack the JSP Wiki Pages for the "private" wiki -->
+ <execution>
+ <id>unpack-wikipages-private</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-${jspwiki.woas.language}</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <excludes>META-INF/**</excludes>
+ <outputDirectory>${project.build.directory}/woas/data/private</outputDirectory>
+ </configuration>
+ </execution>
+ <!-- Unpack the JSP Wiki Pages for the "public" wiki -->
+ <execution>
+ <id>unpack-wikipages-public</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-${jspwiki.woas.language}</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <excludes>META-INF/**</excludes>
+ <outputDirectory>${project.build.directory}/woas/data/public</outputDirectory>
+ </configuration>
+ </execution>
+ <!-- Unpack the tomcat distribution -->
+ <execution>
+ <id>unpack-tomcat-zip</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>7.0.52</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/unpack/tomcat</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <!-- Create the installed/released artifacts -->
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <configuration>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/woas-dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: jspwiki/trunk/jspwiki-portable/readme.md
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/readme.md?rev=1643826&r1=1643825&r2=1643826&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/readme.md (original)
+++ jspwiki/trunk/jspwiki-portable/readme.md Mon Dec 8 14:37:08 2014
@@ -1 +1,34 @@
-This module builds the Portable JSPWiki.
\ No newline at end of file
+# 1. Introduction
+
+This project builds a ready-to-use JSP Wiki distribution
+
+* Based on Tomcat 7.0.52 as servlet engine
+* Using HTTP port 9627 to avoid conflicts with existing servers running on port 80 and/or 8080
+
+# 3. Current State
+
+## 3.1 Mac OS X
+
+* The Mac OS X [JarBundler](http://informagen.com/JarBundler/index.html) 2.2.0 is used to build a native Mac OS X app but it depends on having the Apple JDK installed
+* Supporting a modern Oracle JDK is done using the [Oracle's AppBundler Task](http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/packagingAppsForMac.html)
+
+## 3.2 Jetty vesus Tomcat
+
+Over the time Jetty's memory foot-print become larger and larger so I moved back to an embedded Tomcat
+
+# 2. Available Maven Commands
+
+```
+mvn clean package
+```
+
+# 3. The Public Wiki
+
+To secure the "public" wiki the following accounts were created
+
+* "admin", "lEtMeIn"
+* "user", "user"
+
+
+
+
Added: jspwiki/trunk/jspwiki-portable/src/main/assembly/woas-dist.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/main/assembly/woas-dist.xml?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/main/assembly/woas-dist.xml (added)
+++ jspwiki/trunk/jspwiki-portable/src/main/assembly/woas-dist.xml Mon Dec 8 14:37:08 2014
@@ -0,0 +1,16 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ 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>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/woas</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-portable/src/main/resources/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/main/resources/jspwiki-custom.properties?rev=1643826&r1=1643825&r2=1643826&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/main/resources/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-portable/src/main/resources/jspwiki-custom.properties Mon Dec 8 14:37:08 2014
@@ -18,10 +18,19 @@
#
# Overriding values on classpath:/ini/jspwiki.properties
#
-jspwiki.pageProvider = VersioningFileProvider
-jspwiki.fileSystemProvider.pageDir = ./wiki-files/pages
-jspwiki.basicAttachmentProvider.storageDir = ./wiki-files/pages
+
+jspwiki.pageProvider=VersioningFileProvider
+jspwiki.fileSystemProvider.pageDir=./data/JSPWiki
+jspwiki.basicAttachmentProvider.storageDir=./data/JSPWiki
jspwiki.rss.generate = true
jspwiki.rss.fileName = ./wiki-files/rss/rss.rdf
jspwiki.rss.channelDescription = JSPWiki Portable
-log4j.appender.FileLog.File = ./wiki-files/log/jspwiki.log
\ No newline at end of file
+jspwiki.applicationName=JSPWiki
+jspwiki.security=jaas
+jspwiki.workDir=./temp/JSPWiki
+jspwiki.baseURL=http://localhost:9627/JSPWiki/
+jspwiki.attachment.maxsize=4000000
+jspwiki.attachment.forbid=.html .htm .php .asp .exe .sh .dll
+jspwiki.breakTitleWithSpaces=true
+jspwiki.searchProvider = BasicSearchProvider
+log4j.appender.FileLog.File=./logs/JSPWiki.log
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Info.plist
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Info.plist?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Info.plist (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Info.plist Mon Dec 8 14:37:08 2014
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<plist version="1.0">
+ <dict>
+ <key>CFBundleName</key>
+ <string>woas-apple-jdk</string>
+ <key>CFBundleShortVersionString</key>
+ <string>2.10.1-SNAPSHOT</string>
+ <key>CFBundleGetInfoString</key>
+ <string>JSPWiki 2.10.1-SNAPSHOT</string>
+ <key>CFBundleAllowMixedLocalizations</key>
+ <string>false</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleExecutable</key>
+ <string>JavaApplicationStub</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleIconFile</key>
+ <string>jspwiki.icns</string>
+ <key>Java</key>
+ <dict>
+ <key>MainClass</key>
+ <string>org.apache.catalina.startup.Bootstrap</string>
+ <key>JVMVersion</key>
+ <string>1.6+</string>
+ <key>ClassPath</key>
+ <array>
+ <string>$JAVAROOT/tomcat-launcher-7.0.52.jar</string>
+ </array>
+ <key>VMOptions</key>
+ <string>-Xmx96m</string>
+ </dict>
+ </dict>
+</plist>
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/MacOS/JavaApplicationStub
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/MacOS/JavaApplicationStub?rev=1643826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/MacOS/JavaApplicationStub
------------------------------------------------------------------------------
svn:executable = *
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/MacOS/JavaApplicationStub
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/PkgInfo
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/PkgInfo?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/PkgInfo (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/PkgInfo Mon Dec 8 14:37:08 2014
@@ -0,0 +1 @@
+APPL????
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/Java/tomcat-launcher-7.0.52.jar
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/Java/tomcat-launcher-7.0.52.jar?rev=1643826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/Java/tomcat-launcher-7.0.52.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/jspwiki.icns
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/jspwiki.icns?rev=1643826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas-apple-jdk.app/Contents/Resources/jspwiki.icns
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist Mon Dec 8 14:37:08 2014
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>CFBundleDevelopmentRegion</key>
+<string>English</string>
+<key>CFBundleExecutable</key>
+<string>JavaAppLauncher</string>
+<key>CFBundleIconFile</key>
+<string>jspwiki.icns</string>
+<key>CFBundleIdentifier</key>
+<string>org.apache.jspwiki.jspwiki-portable</string>
+<key>CFBundleDisplayName</key>
+<string>Portable JSPWiki</string>
+<key>CFBundleInfoDictionaryVersion</key>
+<string>6.0</string>
+<key>CFBundleName</key>
+<string>woas</string>
+<key>CFBundlePackageType</key>
+<string>APPL</string>
+<key>CFBundleShortVersionString</key>
+<string>2.10.1-SNAPSHOT</string>
+<key>CFBundleSignature</key>
+<string>????</string>
+<key>CFBundleVersion</key>
+<string>1</string>
+<key>NSHumanReadableCopyright</key>
+<string></string>
+<key>LSApplicationCategoryType</key>
+<string>public.app-category.developer-tools</string>
+<key>JVMMainClassName</key>
+<string>org.apache.catalina.startup.Bootstrap</string>
+<key>JVMOptions</key>
+<array>
+<string>-Xmx96m</string>
+<string>-Duser.dir=$APP_ROOT/..</string>
+<string>-Dcatalina.home=$APP_ROOT/..</string>
+<string>-Dcatalina.base=$APP_ROOT/..</string>
+<string>-Djava.io.tmpdir=$APP_ROOT/../temp</string>
+</array>
+<key>JVMArguments</key>
+<array>
+</array>
+</dict>
+</plist>
+
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-launcher-7.0.52.jar
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-launcher-7.0.52.jar?rev=1643826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-launcher-7.0.52.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher?rev=1643826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher
------------------------------------------------------------------------------
svn:executable = *
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/PkgInfo
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/PkgInfo?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/PkgInfo (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/PkgInfo Mon Dec 8 14:37:08 2014
@@ -0,0 +1 @@
+APPL????
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/en.lproj/Localizable.strings
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/en.lproj/Localizable.strings?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/en.lproj/Localizable.strings (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/en.lproj/Localizable.strings Mon Dec 8 14:37:08 2014
@@ -0,0 +1,3 @@
+"JRELoadError" = "Unable to load Java Runtime Environment.";
+"MainClassNameRequired" = "Main class name is required.";
+"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/jspwiki.icns
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/jspwiki.icns?rev=1643826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/jspwiki.icns
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.bat
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.bat?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.bat (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.bat Mon Dec 8 14:37:08 2014
@@ -0,0 +1,29 @@
+@ECHO OFF
+
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+REM %~dp0 is expanded pathname of the current script under NT
+
+SET JSPWIKI_HOME=%~dp0
+
+SET CATALINA_HOME=%JSPWIKI_HOME%
+SET CATALINA_BASE=%JSPWIKI_HOME%
+SET CATALINA_OUT=%CATALINA_BASE%/logs/catalina.out
+SET CATALINA_TMPDIR=%CATALINA_BASE%/temp
+SET CATALINA_OPTS="-Xmx128m"
+
+cd %JSPWIKI_HOME%
+./bin/catalina.bat %1 %2 %3
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe?rev=1643826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.sh
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.sh?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.sh (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.sh Mon Dec 8 14:37:08 2014
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#############################################################################
+# Helper script to run JSPWiki
+#############################################################################
+
+# uncomment for remote debugging
+
+# export JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"
+
+# get the directory where the script is located
+
+export JSPWIKI_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# overwrite the various CATALINA properties to play safe with a developer box
+
+export CATALINA_HOME=${JSPWIKI_HOME}
+export CATALINA_BASE=${JSPWIKI_HOME}
+export CATALINA_OUT=${CATALINA_BASE}/logs/catalina.out
+export CATALINA_TMPDIR=${CATALINA_BASE}/temp
+export CATALINA_OPTS="-Xmx128m"
+
+# invoke the Tomcat start script from the JSPWIKI_HOME
+# in order to use relative path names
+
+cd ${JSPWIKI_HOME}
+./bin/catalina.sh "$@"
\ No newline at end of file
Propchange: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.sh
------------------------------------------------------------------------------
svn:executable = *
Added: jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.url
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.url?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.url (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/launchers/tomcat/woas.url Mon Dec 8 14:37:08 2014
@@ -0,0 +1,6 @@
+[InternetShortcut]
+URL=http://localhost:9627/
+IDList=
+HotKey=0
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
Added: jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/catalina.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/catalina.properties?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/catalina.properties (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/catalina.properties Mon Dec 8 14:37:08 2014
@@ -0,0 +1,132 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+# "foo": Add this folder as a class repository
+# "foo/*.jar": Add all the JARs of the specified folder as class
+# repositories
+# "foo/bar.jar": Add bar.jar as a class repository
+# common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/jspwiki/lib,${catalina.home}/jspwiki/lib/*.jar
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+# "foo": Add this folder as a class repository
+# "foo/*.jar": Add all the JARs of the specified folder as class
+# repositories
+# "foo/bar.jar": Add bar.jar as a class repository
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+# "foo": Add this folder as a class repository
+# "foo/*.jar": Add all the JARs of the specified folder as class
+# repositories
+# "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+shared.loader=
+
+# List of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. Scan specific lists (to exclude JARs
+# from individual scans) follow this. The list must be a comma separated list of
+# JAR file names.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.DefaultJarScanner.jarsToSkip=\
+bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
+annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\
+catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\
+jasper.jar,jasper-el.jar,ecj-*.jar,\
+tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
+tomcat-jni.jar,tomcat-spdy.jar,\
+tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
+tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
+tomcat-jdbc.jar,\
+tools.jar,\
+commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\
+commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
+commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\
+commons-math*.jar,commons-pool*.jar,\
+jstl.jar,\
+geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
+ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
+jmx-tools.jar,jta*.jar,log4j.jar,log4j-1*.jar,mail*.jar,slf4j*.jar,\
+xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
+junit.jar,junit-*.jar,hamcrest*.jar,org.hamcrest*.jar,ant-launcher.jar,\
+cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar,\
+jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,\
+xom-*.jar
+
+# Additional JARs (over and above the default JARs listed above) to skip when
+# scanning for Servlet 3.0 pluggability features. These features include web
+# fragments, annotations, SCIs and classes that match @HandlesTypes. The list
+# must be a comma separated list of JAR file names.
+org.apache.catalina.startup.ContextConfig.jarsToSkip=
+
+# Additional JARs (over and above the default JARs listed above) to skip when
+# scanning for TLDs. The list must be a comma separated list of JAR file names.
+org.apache.catalina.startup.TldConfig.jarsToSkip=tomcat7-websocket.jar
+
+#
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
Added: jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/server.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/server.xml?rev=1643826&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/server.xml (added)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/conf/server.xml Mon Dec 8 14:37:08 2014
@@ -0,0 +1,139 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+ <!-- Security listener. Documentation at /docs/config/listeners.html
+ <Listener className="org.apache.catalina.security.SecurityListener" />
+ -->
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- A "Service" is a collection of one or more "Connectors" that share
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
+ -->
+ <Service name="Catalina">
+
+ <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="3" minSpareThreads="1"/>
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL HTTP/1.1 Connector on port 8080
+ -->
+ <Connector executor="tomcatThreadPool" port="9627" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="9643" compression="on"/>
+
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ -->
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443
+ This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
+ <!--
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS" />
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+ <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ analyzes the HTTP headers included with the request, and passes them
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
+
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
+
+ <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+ via a brute-force attack -->
+ <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+ </Realm>
+
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="true" autoDeploy="false">
+
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html
+ Note: The pattern used is equivalent to using pattern="common" -->
+ <!--
+ <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+ prefix="localhost_access_log." suffix=".txt"
+ pattern="%h %l %u %t "%r" %s %b" />
+ -->
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>