Author: gmazza
Date: Sun Mar 24 13:45:51 2013
New Revision: 1460376
URL: http://svn.apache.org/r1460376
Log:
More work on Maven pom.
Removed:
incubator/jspwiki/trunk/src/webdocs/applets/
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/pom.xml
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1460376&r1=1460375&r2=1460376&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Mar 24 13:45:51 2013
@@ -1,3 +1,9 @@
+2013-03-24 Glen Mazza (glenmazza AT apache DOT org)
+
+ * Removed empty src/applets folder
+
+ * More work on Maven WAR plugin configuration
+
2013-03-21 Juan Pablo Santos (juanpablo AT apache DOT org)
* JSPWIKI-651: added m2e configuration to pom.xml
Modified: incubator/jspwiki/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1460376&r1=1460375&r2=1460376&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Sun Mar 24 13:45:51 2013
@@ -205,7 +205,9 @@
<build>
- <finalName>JSPWiki</finalName>
+ <!-- below name temporary to distinguish from Ant JSPWiki -->
+ <finalName>MavenJSPWiki</finalName>
+ <!--finalName>JSPWiki</finalName-->
<sourceDirectory>${basedir}/src</sourceDirectory>
<testSourceDirectory>${basedir}/tests</testSourceDirectory>
<resources>
@@ -353,6 +355,32 @@
<version>2.3</version>
<configuration>
<webXml>etc/web.xml</webXml>
+ <webResources>
+ <!--resource>
+ <directory>etc</directory>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include name="dtd/**" />
+ <include name="commons-logging.properties" />
+ <include name="jspwiki.policy" />
+ <include name="jspwiki.properties" />
+ <include name="*.tld" />
+ <include name="userdatabase.xml" />
+ <include name="groupdatabase.xml" />
+ <include>geronimo-web.xml</include>
+ </includes>
+ </resource-->
+ <resource>
+ <directory>src/webdocs</directory>
+ <includes>
+ <include>admin/**</include>
+ <include>error/**</include>
+ <include>images/**</include>
+ <include>*.jsp</include>
+ <include>*.css</include>
+ </includes>
+ </resource>
+ </webResources>
<!--webResources>
<resource>
<directory>etc</directory>
