You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/05/01 21:43:11 UTC
svn commit: r1478159 - in /incubator/jspwiki/trunk: ./
src/main/java/org/apache/wiki/ src/main/webapp/ src/main/webapp/WEB-INF/
Author: gmazza
Date: Wed May 1 19:43:11 2013
New Revision: 1478159
URL: http://svn.apache.org/r1478159
Log:
tld and policy files now moved to webapps/WEB-INF location
Added:
incubator/jspwiki/trunk/src/main/webapp/WEB-INF/geronimo-web.xml
- copied unchanged from r1478146, incubator/jspwiki/trunk/src/main/webapp/geronimo-web.xml
incubator/jspwiki/trunk/src/main/webapp/WEB-INF/jspwiki.policy
- copied unchanged from r1478146, incubator/jspwiki/trunk/src/main/webapp/jspwiki.policy
incubator/jspwiki/trunk/src/main/webapp/WEB-INF/jspwiki.tld
- copied unchanged from r1478146, incubator/jspwiki/trunk/src/main/webapp/jspwiki.tld
incubator/jspwiki/trunk/src/main/webapp/WEB-INF/jstl-fmt.tld
- copied unchanged from r1478146, incubator/jspwiki/trunk/src/main/webapp/jstl-fmt.tld
incubator/jspwiki/trunk/src/main/webapp/WEB-INF/oscache.tld
- copied unchanged from r1478146, incubator/jspwiki/trunk/src/main/webapp/oscache.tld
Removed:
incubator/jspwiki/trunk/src/main/webapp/geronimo-web.xml
incubator/jspwiki/trunk/src/main/webapp/jspwiki.policy
incubator/jspwiki/trunk/src/main/webapp/jspwiki.tld
incubator/jspwiki/trunk/src/main/webapp/jstl-fmt.tld
incubator/jspwiki/trunk/src/main/webapp/oscache.tld
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/pom.xml
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1478159&r1=1478158&r2=1478159&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed May 1 19:43:11 2013
@@ -1,5 +1,13 @@
2013-04-30 Glen Mazza (glenmazza AT apache DOT org)
+ * 2.9.1-incubating-7
+
+ * Moved WAR resources from previous commit to correct src/main/webapps/WEB-INF location, fixed pom.xml
+ to stop duplicating those resources in both webapps and webapps/WEB-INF
+
+
+2013-04-30 Glen Mazza (glenmazza AT apache DOT org)
+
* 2.9.1-incubating-6
* Moved WAR resources that don't require modification from etc/ to Mavenized src/main/webapps location.
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1478159&r1=1478158&r2=1478159&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed May 1 19:43:11 2013
@@ -536,7 +536,7 @@
<include name="userdatabase.xml" />
<include name="groupdatabase.xml" />
</webinf>
- <webinf dir="src/main/webapp">
+ <webinf dir="src/main/webapp/WEB-INF">
<include name="geronimo-web.xml" />
<include name="*.tld" />
<include name="jspwiki.policy" />
@@ -843,7 +843,7 @@
<formatter type="xml" usefile="yes" />
<batchtest todir="${tests.reports}">
<fileset dir="${tests.src}">
- <exclude name="**/*Test.java" />
+ <include name="**/*Test.java" />
<exclude name="**/AllTest*java" />
<include name="**/StressTestSpeed.java" if="tests.stress.enabled"/>
<include name="**/StressTestVersioningProvider.java" if="tests.stress.enabled"/>
@@ -1016,7 +1016,7 @@ If all of the tests ran successfully, th
<!-- Copy the WEB-INF files -->
<copy toDir="@{context.dir}/webapp/WEB-INF">
- <fileset dir="src/main/webapp">
+ <fileset dir="src/main/webapp/WEB-INF">
<include name="jspwiki.policy" />
<include name="*.tld" />
</fileset>
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1478159&r1=1478158&r2=1478159&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Wed May 1 19:43:11 2013
@@ -428,15 +428,6 @@
</includes>
</resource>
<resource>
- <directory>src/main/webapp</directory>
- <targetPath>WEB-INF</targetPath>
- <includes>
- <include>geronimo-web.xml</include>
- <include>jspwiki.policy</include>
- <include>*.tld</include>
- </includes>
- </resource>
- <resource>
<directory>src/webdocs</directory>
<includes>
<include>admin/**</include>
Modified: incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java?rev=1478159&r1=1478158&r2=1478159&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java Wed May 1 19:43:11 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "6";
+ public static final String BUILD = "7";
/**
* This is the generic version string you should use