Return-Path: 
 <commits-return-3034-apmail-jspwiki-commits-archive=jspwiki.apache.org@jspwiki.apache.org>
X-Original-To: apmail-jspwiki-commits-archive@www.apache.org
Delivered-To: apmail-jspwiki-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0A06410491
	for <apmail-jspwiki-commits-archive@www.apache.org>;
 Tue, 11 Mar 2014 19:45:31 +0000 (UTC)
Received: (qmail 36963 invoked by uid 500); 11 Mar 2014 19:28:50 -0000
Delivered-To: apmail-jspwiki-commits-archive@jspwiki.apache.org
Received: (qmail 36921 invoked by uid 500); 11 Mar 2014 19:28:38 -0000
Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jspwiki.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jspwiki.apache.org>
List-Post: <mailto:commits@jspwiki.apache.org>
List-Id: <commits.jspwiki.apache.org>
Reply-To: dev@jspwiki.apache.org
Delivered-To: mailing list commits@jspwiki.apache.org
Received: (qmail 36908 invoked by uid 99); 11 Mar 2014 19:28:31 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2014 19:28:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2014 19:28:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 7510923888D7;
	Tue, 11 Mar 2014 19:28:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1576481 - in /jspwiki/trunk: ChangeLog
 jspwiki-war/pom.xml
Date: Tue, 11 Mar 2014 19:28:10 -0000
To: commits@jspwiki.apache.org
From: metskem@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140311192810.7510923888D7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: metskem
Date: Tue Mar 11 19:28:10 2014
New Revision: 1576481

URL: http://svn.apache.org/r1576481
Log:
2014-03-11  Harry Metske (metskem@apache.org)

       * Fixed JSPWIKI-823 - set java.io.tmpdir to ${project.build.directory} in pom.xml

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-war/pom.xml

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1576481&r1=1576480&r2=1576481&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Mar 11 19:28:10 2014
@@ -1,5 +1,9 @@
 2014-03-11  Harry Metske (metskem@apache.org)
 
+       * Fixed JSPWIKI-823 - set java.io.tmpdir to ${project.build.directory} in pom.xml
+
+2014-03-11  Harry Metske (metskem@apache.org)
+
        * Fixed JSPWIKI-827 - Migrate the mvn_cheatsheet.txt to Markdown
 
 2014-03-03  Harry Metske (metskem@apache.org)

Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1576481&r1=1576480&r2=1576481&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Tue Mar 11 19:28:10 2014
@@ -218,6 +218,9 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <systemPropertyVariables>
+              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+          </systemPropertyVariables>          
           <excludes>
             <!-- time-consuming tests excluded by default -->
             <exclude>**/StressTestVersioningProvider.java</exclude>
@@ -351,6 +354,32 @@
           </webResources>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <!-- Unpack the JSP Wiki Pages -->
+          <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-en</artifactId>
+                  <version>${project.version}</version>
+                </artifactItem>
+              </artifactItems>
+              <excludes>META-INF/**</excludes>
+              <outputDirectory>${project.build.directory}/jspwiki/data/jspwiki-files</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>  
+      </plugin>
     </plugins>
   </build>
 </project>