You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2014/02/20 00:56:12 UTC
svn commit: r1569994 - in /jspwiki/trunk/jspwiki-portable: ./ build.xml
pom.xml src/ src/main/ src/main/config/ src/main/config/jspwiki.ico
src/main/config/jspwiki.png src/main/resources/
src/main/resources/jspwiki-custom.properties
Author: juanpablo
Date: Wed Feb 19 23:56:12 2014
New Revision: 1569994
URL: http://svn.apache.org/r1569994
Log:
[JSPWIKI-769 related] jspwiki-portable module, right now only Windows executable is generated, cfr. with https://jspwiki-wiki.apache.org/Wiki.jsp?page=PortableBinaries
Added:
jspwiki/trunk/jspwiki-portable/
jspwiki/trunk/jspwiki-portable/build.xml
jspwiki/trunk/jspwiki-portable/pom.xml
jspwiki/trunk/jspwiki-portable/src/
jspwiki/trunk/jspwiki-portable/src/main/
jspwiki/trunk/jspwiki-portable/src/main/config/
jspwiki/trunk/jspwiki-portable/src/main/config/jspwiki.ico (with props)
jspwiki/trunk/jspwiki-portable/src/main/config/jspwiki.png (with props)
jspwiki/trunk/jspwiki-portable/src/main/resources/
jspwiki/trunk/jspwiki-portable/src/main/resources/jspwiki-custom.properties
Added: jspwiki/trunk/jspwiki-portable/build.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/build.xml?rev=1569994&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/build.xml (added)
+++ jspwiki/trunk/jspwiki-portable/build.xml Wed Feb 19 23:56:12 2014
@@ -0,0 +1,64 @@
+<!--
+ 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
Added: jspwiki/trunk/jspwiki-portable/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/pom.xml?rev=1569994&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/pom.xml (added)
+++ jspwiki/trunk/jspwiki-portable/pom.xml Wed Feb 19 23:56:12 2014
@@ -0,0 +1,175 @@
+<?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
Added: jspwiki/trunk/jspwiki-portable/src/main/config/jspwiki.ico
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/main/config/jspwiki.ico?rev=1569994&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/main/config/jspwiki.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jspwiki/trunk/jspwiki-portable/src/main/config/jspwiki.png
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/main/config/jspwiki.png?rev=1569994&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-portable/src/main/config/jspwiki.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: 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=1569994&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/main/resources/jspwiki-custom.properties (added)
+++ jspwiki/trunk/jspwiki-portable/src/main/resources/jspwiki-custom.properties Wed Feb 19 23:56:12 2014
@@ -0,0 +1,27 @@
+# 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.
+
+#
+# Overriding values on classpath:/ini/jspwiki.properties
+#
+jspwiki.pageProvider = VersioningFileProvider
+jspwiki.fileSystemProvider.pageDir = ./wiki-files/pages
+jspwiki.basicAttachmentProvider.storageDir = ./wiki-files/pages
+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