Hi folks,
sorry my fault - I have too many cross-cutting changes on my box
unpacking the JSP Wiki pages for running the jspwiki-war is
https://issues.apache.org/jira/browse/JSPWIKI-824
The relevant change is
+ <systemPropertyVariables>
+ <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+ </systemPropertyVariables>
to use "./target" as temporary directory
I cloned the current trunk on Github
(https://github.com/sgoeschl/apache-jspwiki) to have my changes under
version control
+ JSPWIKI-823
https://github.com/sgoeschl/apache-jspwiki/commit/81e77ad1ed585cb3cad253511e7fd2543abaa5e8
+ JSPWIKI-824
https://github.com/sgoeschl/apache-jspwiki/commit/05259e090f6a37f93d8ececb698dfaa81f6bf8a4
&
https://github.com/sgoeschl/apache-jspwiki/commit/dd6f7d919136dc49fcc12df8fa198d5612385b8d
but requires JSPWIKI-826
+ JSPWIKI-826
https://github.com/sgoeschl/apache-jspwiki/commit/c310177f86e0aff34b9387771f61a7361e17ac8a
In the meantime I'm working on JSPWIKI-829 Integrate jspwiki-portable
into the jspwiki maven build
Cheers,
Siegfried Goeschl
On 12.03.14 01:37, Craig L Russell wrote:
Hi Harry,
Was your change to jspwiki/trunk/jspwiki-war/pom.xml intentional? It doesn't
appear to be related to the JSPWIKI-823...
Craig
On Mar 11, 2014, at 12:28 PM, mets...@apache.org wrote:
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 (mets...@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 (mets...@apache.org)
+ * Fixed JSPWIKI-823 - set java.io.tmpdir to ${project.build.directory}
in pom.xml
+
+2014-03-11 Harry Metske (mets...@apache.org)
+
* Fixed JSPWIKI-827 - Migrate the mvn_cheatsheet.txt to Markdown
2014-03-03 Harry Metske (mets...@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>
Craig L Russell
Architect, Oracle
http://db.apache.org/jdo
408 276-5638 mailto:craig.russ...@oracle.com
P.S. A good JDO? O, Gasp!
