Author: gmazza
Date: Mon May 6 20:21:21 2013
New Revision: 1479697
URL: http://svn.apache.org/r1479697
Log:
More Mavenization of files in tests/etc
Added:
incubator/jspwiki/trunk/src/test/resources/TestPlugins.txt
- copied unchanged from r1479571,
incubator/jspwiki/trunk/tests/etc/TestPlugins.txt
incubator/jspwiki/trunk/src/test/resources/TextFormattingRules.txt
- copied unchanged from r1479571,
incubator/jspwiki/trunk/tests/etc/TextFormattingRules.txt
incubator/jspwiki/trunk/src/test/resources/groupdatabase.xml
- copied unchanged from r1479571,
incubator/jspwiki/trunk/tests/etc/groupdatabase.xml.tmpl
incubator/jspwiki/trunk/src/test/resources/jspwiki-testUserPolicy.policy
- copied unchanged from r1479571,
incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy
incubator/jspwiki/trunk/src/test/resources/jspwiki.policy
- copied unchanged from r1479571,
incubator/jspwiki/trunk/tests/etc/jspwiki.policy
incubator/jspwiki/trunk/src/test/resources/test.properties
- copied unchanged from r1479571,
incubator/jspwiki/trunk/tests/etc/test.properties
incubator/jspwiki/trunk/src/test/resources/userdatabase.xml
- copied unchanged from r1479571,
incubator/jspwiki/trunk/tests/etc/userdatabase.xml.tmpl
Removed:
incubator/jspwiki/trunk/tests/etc/TestPlugins.txt
incubator/jspwiki/trunk/tests/etc/TextFormattingRules.txt
incubator/jspwiki/trunk/tests/etc/groupdatabase.xml.tmpl
incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy
incubator/jspwiki/trunk/tests/etc/jspwiki.policy
incubator/jspwiki/trunk/tests/etc/test.properties
incubator/jspwiki/trunk/tests/etc/userdatabase.xml.tmpl
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
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/UserManagerTest.java
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
incubator/jspwiki/trunk/src/test/resources/jspwiki.properties
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon May 6 20:21:21 2013
@@ -1,3 +1,9 @@
+2013-05-06 Glen Mazza (glenmazza AT apache DOT org)
+
+ * 2.9.1-incubating-10
+
+ * Mavenized locations of most tests/etc/ files -> src/test/resources
+
2013-05-03 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.9.1-incubating-9
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Mon May 6 20:21:21 2013
@@ -315,13 +315,9 @@
<delete file="${code.i18n}/CoreResources_en.properties" />
<delete file="${code.i18n}/plugin/PluginResources_en.properties" />
<delete file="${code.i18n}/templates/default_en.properties" />
- <delete file="tests/etc/groupdatabase.xml" />
- <delete file="tests/etc/userdatabase.xml" />
<delete dir="target" />
<delete dir="tests/etc/db" />
<delete dir="tests/etc/WEB-INF" />
- <delete file="tests/etc/groupdatabase.xml.old" />
- <delete file="tests/etc/userdatabase.xml.old" />
<delete>
<fileset dir="." includes="**/*~" defaultexcludes="no"/>
<fileset dir="." includes="**/#*#" defaultexcludes="no"/>
@@ -772,12 +768,6 @@
<target name="tests-init" depends="init">
<!-- Build up the /etc directory for testing -->
- <delete file="tests/etc/userdatabase.xml" />
- <delete file="tests/etc/userdatabase.xml.old" />
- <copy file="tests/etc/userdatabase.xml.tmpl"
toFile="tests/etc/userdatabase.xml"/>
- <delete file="tests/etc/groupdatabase.xml" />
- <delete file="tests/etc/groupdatabase.xml.old" />
- <copy file="tests/etc/groupdatabase.xml.tmpl"
toFile="tests/etc/groupdatabase.xml"/>
<mkdir dir="tests/etc/WEB-INF" />
<!-- Create web.xml files for testing -->
@@ -838,7 +828,11 @@
</copy>
<copy todir="target/test-classes">
<fileset dir="src/test/resources">
+ <!-- three jspwiki*.properties files filtered, so skipped -->
<include name="*.xml"/>
+ <include name="*.txt"/>
+ <include name="*.policy"/>
+ <include name="test.properties"/>
</fileset>
</copy>
@@ -1028,7 +1022,7 @@ If all of the tests ran successfully, th
<include name="jspwiki.policy" />
<include name="*.tld" />
</fileset>
- <fileset dir="tests/etc" includes="userdatabase.xml groupdatabase.xml"
/>
+ <fileset dir="target/test-classes" includes="userdatabase.xml
groupdatabase.xml" />
</copy>
<copy toFile="@{context.dir}/webapp/WEB-INF/web.xml" file="@{webxml}"
flatten="true" />
@@ -1228,7 +1222,7 @@ To automate the JAR signing processs, yo
JDBC-compliant database such as Postgresql.
Step 2: If desired, modify the database properties in
- tests/etc/jdbc.properties.impl. The defaults given should be
sufficient
+ tests/etc/jdbc.properties.tmpl. The defaults given should be
sufficient
for JDBC testing using hsql on any developer's local machine.
The 'jdbc.driver.id' property in this file (defaulted to hsql) is
Modified: incubator/jspwiki/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Mon May 6 20:21:21 2013
@@ -228,17 +228,6 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
- <testResource>
- <directory>tests/etc</directory>
- <includes>
- <include>jspwiki.policy</include>
- <include>jspwiki-testUserPolicy.policy</include>
- <include>test.properties</include>
- <include>log4j.properties</include>
- <include>TextFormattingRules.txt</include>
- <include>TestPlugins.txt</include>
- </includes>
- </testResource>
</testResources>
<plugins>
<plugin>
@@ -287,8 +276,6 @@
<copy
file="src/main/resources/templates/default.properties"
tofile="target/classes/templates/default_en.properties"/>
<copy
file="src/main/resources/plugin/PluginResources.properties"
tofile="target/classes/plugin/PluginResources_en.properties"/>
- <copy file="tests/etc/userdatabase.xml.tmpl"
toFile="tests/etc/userdatabase.xml"/>
- <copy file="tests/etc/groupdatabase.xml.tmpl"
toFile="tests/etc/groupdatabase.xml"/>
<copy file="etc/jspwiki.properties.tmpl"
tofile="etc/jspwiki.properties" />
<!-- Filter the properties files -->
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=1479697&r1=1479696&r2=1479697&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 Mon May
6 20:21:21 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 = "9";
+ public static final String BUILD = "10";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/UserManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/UserManagerTest.java?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/UserManagerTest.java
(original)
+++
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/UserManagerTest.java
Mon May 6 20:21:21 2013
@@ -58,7 +58,7 @@ public class UserManagerTest extends Tes
props.remove( "jspwiki.approver"+UserManager.SAVE_APPROVER );
// Make sure we are using the XML user database
- props.put( XMLUserDatabase.PROP_USERDATABASE, "tests/etc/userdatabase.xml"
);
+ props.put( XMLUserDatabase.PROP_USERDATABASE,
"target/test-classes/userdatabase.xml" );
m_engine = new TestEngine( props );
m_mgr = m_engine.getUserManager();
m_db = m_mgr.getUserDatabase();
@@ -84,7 +84,7 @@ public class UserManagerTest extends Tes
props.put( "jspwiki.approver."+UserManager.SAVE_APPROVER, "Admin" );
// Make sure we are using the XML user database
- props.put( XMLUserDatabase.PROP_USERDATABASE,
"tests/etc/userdatabase.xml" );
+ props.put( XMLUserDatabase.PROP_USERDATABASE,
"target/test-classes/userdatabase.xml" );
m_engine = new TestEngine( props );
m_mgr = m_engine.getUserManager();
m_db = m_mgr.getUserDatabase();
Modified:
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
(original)
+++
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
Mon May 6 20:21:21 2013
@@ -105,7 +105,7 @@ public class AnonymousLoginModuleTest ex
{
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- props.put(XMLUserDatabase.PROP_USERDATABASE,
"tests/etc/userdatabase.xml");
+ props.put(XMLUserDatabase.PROP_USERDATABASE,
"target/test-classes/userdatabase.xml" );
m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
m_subject = new Subject();
@@ -120,4 +120,4 @@ public class AnonymousLoginModuleTest ex
}
}
-}
\ No newline at end of file
+}
Modified:
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
(original)
+++
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
Mon May 6 20:21:21 2013
@@ -116,7 +116,7 @@ public class CookieAssertionLoginModuleT
{
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- props.put(XMLUserDatabase.PROP_USERDATABASE,
"tests/etc/userdatabase.xml");
+ props.put(XMLUserDatabase.PROP_USERDATABASE,
"target/test-classes/userdatabase.xml" );
m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
m_subject = new Subject();
@@ -131,4 +131,4 @@ public class CookieAssertionLoginModuleT
}
}
-}
\ No newline at end of file
+}
Modified:
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
(original)
+++
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
Mon May 6 20:21:21 2013
@@ -120,7 +120,7 @@ public class UserDatabaseLoginModuleTest
{
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- props.put(XMLUserDatabase.PROP_USERDATABASE,
"tests/etc/userdatabase.xml");
+ props.put(XMLUserDatabase.PROP_USERDATABASE,
"target/test-classes/userdatabase.xml" );
m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
m_subject = new Subject();
@@ -135,4 +135,4 @@ public class UserDatabaseLoginModuleTest
}
}
-}
\ No newline at end of file
+}
Modified:
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
(original)
+++
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
Mon May 6 20:21:21 2013
@@ -114,7 +114,7 @@ public class WebContainerLoginModuleTest
{
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- props.put(XMLUserDatabase.PROP_USERDATABASE,
"tests/etc/userdatabase.xml");
+ props.put(XMLUserDatabase.PROP_USERDATABASE,
"target/test-classes/userdatabase.xml" );
m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
m_subject = new Subject();
@@ -129,4 +129,4 @@ public class WebContainerLoginModuleTest
}
}
-}
\ No newline at end of file
+}
Modified:
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
(original)
+++
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
Mon May 6 20:21:21 2013
@@ -51,7 +51,7 @@ public class XMLUserDatabaseTest extends
super.setUp();
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- props.put(XMLUserDatabase.PROP_USERDATABASE,
"tests/etc/userdatabase.xml");
+ props.put(XMLUserDatabase.PROP_USERDATABASE,
"target/test-classes/userdatabase.xml" );
WikiEngine engine = new TestEngine(props);
m_db = new XMLUserDatabase();
m_db.initialize(engine, props);
Modified: incubator/jspwiki/trunk/src/test/resources/jspwiki.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/resources/jspwiki.properties?rev=1479697&r1=1479696&r2=1479697&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/test/resources/jspwiki.properties (original)
+++ incubator/jspwiki/trunk/src/test/resources/jspwiki.properties Mon May 6
20:21:21 2013
@@ -91,9 +91,9 @@ jspwiki.translatorReader.inlinePattern.3
jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager
#jspwiki.authorizer =
org.apache.wiki.auth.authorize.WebContainerAuthorizer
jspwiki.groupdatabase = org.apache.wiki.auth.authorize.XMLGroupDatabase
-jspwiki.xmlGroupDatabaseFile = tests/etc/groupdatabase.xml
+jspwiki.xmlGroupDatabaseFile = target/test-classes/groupdatabase.xml
jspwiki.userdatabase = org.apache.wiki.auth.user.XMLUserDatabase
-jspwiki.xmlUserDatabaseFile = tests/etc/userdatabase.xml
+jspwiki.xmlUserDatabaseFile = target/test-classes/userdatabase.xml
jspwiki.admin.user = admin
jspwiki.userdatabase.datasource=jdbc/UserDatabase
