svn commit: r1478415 - in /incubator/jspwiki/trunk: ChangeLog build.xml pom.xml

[gm...@apache.org]

Author: gmazza
Date: Thu May  2 15:38:08 2013
New Revision: 1478415

URL: http://svn.apache.org/r1478415
Log:
Partial rollback of last commit.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/pom.xml

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1478415&r1=1478414&r2=1478415&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu May  2 15:38:08 2013
@@ -1,3 +1,7 @@
+2013-05-02 Glen Mazza (glenmazza AT apache DOT org)
+
+       * Removed install.sh, slight renaming of web.xml files generated in build.xml for readability
+         
 2013-04-30 Glen Mazza (glenmazza AT apache DOT org)
 
        * 2.9.1-incubating-7

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1478415&r1=1478414&r2=1478415&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Thu May  2 15:38:08 2013
@@ -794,14 +794,14 @@
       <replace file="${webtests.build}/webtest.web.xml"
                token="REMOVE ME TO ENABLE JDBC DATABASE  --&gt;" value="" />
 
-      <!-- For unit testing, turn on container auth -->
+      <!-- For unit testing and some webtests, turn on container auth -->
       <copy file="${webtests.build}/webtest.web.xml"
-          tofile="${webtests.build}/unittest.web.xml" overwrite="true" />
-      <replace file="${webtests.build}/unittest.web.xml"
+          tofile="${webtests.build}/containerauth.web.xml" overwrite="true" />
+      <replace file="${webtests.build}/containerauth.web.xml"
                token="&lt;!--  REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH" value="" />
-      <replace file="${webtests.build}/unittest.web.xml"
+      <replace file="${webtests.build}/containerauth.web.xml"
                token="REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH  --&gt;" value="" />
-      <copy file="${webtests.build}/unittest.web.xml"
+      <copy file="${webtests.build}/containerauth.web.xml"
           tofile="tests/etc/WEB-INF/web.xml" overwrite="true" />
 
   </target>
@@ -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"/>
@@ -935,7 +935,7 @@
 
     <!-- Build the container auth WAR -->
     <webtest-setup context="test-container"
-      webxml="${webtests.build}/unittest.web.xml" />
+      webxml="${webtests.build}/containerauth.web.xml" />
 
     <!-- Build the custom auth WAR (JDBC database) -->
     <webtest-setup context="test-custom-jdbc"
@@ -948,7 +948,7 @@
 
     <!-- Build the container auth WAR (JDBC database) and test it -->
     <webtest-setup context="test-container-jdbc"
-      webxml="${webtests.build}/unittest.web.xml">
+      webxml="${webtests.build}/containerauth.web.xml">
       <propertyfile-entries>
         <entry key="jspwiki.userdatabase" value="org.apache.wiki.auth.user.JDBCUserDatabase" />
         <entry key="jspwiki.groupdatabase" value="org.apache.wiki.auth.authorize.JDBCGroupDatabase" />

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1478415&r1=1478414&r2=1478415&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Thu May  2 15:38:08 2013
@@ -212,15 +212,6 @@
 
     <build>
         <finalName>JSPWiki</finalName>
-        <filters>
-            <filter>src/main/filters/glen.properties</filter>        
-        </filters>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
         <testResources>
             <testResource>
                 <directory>src/test/resources</directory>