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/08/15 19:35:48 UTC
svn commit: r1514392 - in /jspwiki/trunk: ./ jspwiki-it-tests/
jspwiki-it-tests/jspwiki-it-test-custom/
jspwiki-it-tests/jspwiki-selenium-tests/
jspwiki-it-tests/jspwiki-selenium-tests/src/main/config/
jspwiki-it-tests/jspwiki-selenium-tests/src/main/c...
Author: gmazza
Date: Thu Aug 15 17:35:47 2013
New Revision: 1514392
URL: http://svn.apache.org/r1514392
Log:
Removed unneed config files from integration test module & other changes as given in ChangeLog.
Added:
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/config/hsql-userdb-setup.ddl
- copied unchanged from r1514321, jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-setup.ddl
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/config/hsql-userdb-teardown.ddl
- copied unchanged from r1514321, jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-teardown.ddl
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat7-context.xml
- copied unchanged from r1514321, jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/tomcat7-context.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
- copied, changed from r1514321, jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/jspwiki-custom.properties
Removed:
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-setup.ddl
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-teardown.ddl
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jdbc.properties
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java
jspwiki/trunk/jspwiki-it-tests/pom.xml
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.policy
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Thu Aug 15 17:35:47 2013
@@ -1,3 +1,16 @@
+2013-08-15 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-40
+
+ * Removed unneeded config files in Selenium IT module, changed its packaging to WAR
+ and its parent to the it tests folder. JDBC tests still inoperative, but others
+ working as before.
+
+ * Removed jdbc.properties file in favor of configuring it in jspwiki-custom.properties.
+
+ * jspwiki.policy file in test updated to more recent structure used by the integrated
+ tests module, subsequently removed from latter as it's unneeded there.
+
2013-08-14 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-39
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml Thu Aug 15 17:35:47 2013
@@ -21,6 +21,8 @@
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
@@ -28,10 +30,9 @@
</parent>
<artifactId>jspwiki-it-test-custom</artifactId>
- <modelVersion>4.0.0</modelVersion>
- <description>selenium tests execution for jspwiki-it-test-custom (custom auth, relative URLs)</description>
<packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
-
+ <description>selenium tests execution for jspwiki-it-test-custom (custom auth, relative URLs)</description>
+
<properties> <!-- values injected at jspwiki.properties & selenium templates -->
<!-- this enables tests reuse [3/3] -->
<it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Thu Aug 15 17:35:47 2013
@@ -22,13 +22,14 @@
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-builder</artifactId>
+ <groupId>org.apache.jspwiki.it</groupId>
+ <artifactId>jspwiki-it-builder</artifactId>
<version>2.10.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>jspwiki-selenium-tests</artifactId>
+ <packaging>war</packaging>
<modelVersion>4.0.0</modelVersion>
<description>templates of selenium tests for jspwiki</description>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java Thu Aug 15 17:35:47 2013
@@ -74,7 +74,7 @@ public class HsqlDbUtils
{
LOG.error( e.getMessage(), e );
}
- exec( "./target/classes/hsql-userdb-setup.ddl" );
+ exec( "./src/main/config/hsql-userdb-setup.ddl" );
}
/**
@@ -82,7 +82,7 @@ public class HsqlDbUtils
*/
public void tearDown()
{
- exec( "./target/classes/hsql-userdb-teardown.ddl" );
+ exec( "./src/main/config/hsql-userdb-teardown.ddl" );
stop();
}
@@ -93,7 +93,7 @@ public class HsqlDbUtils
{
// start Hypersonic server
- Properties hProps = loadPropertiesFrom( "/jdbc.properties" );
+ Properties hProps = loadPropertiesFrom( "/jspwiki-custom.properties" );
hsqlServer = new Server();
// pre-checks
@@ -171,7 +171,7 @@ public class HsqlDbUtils
Connection getConnection() throws IOException, SQLException
{
Connection conn;
- Properties jProps = loadPropertiesFrom( "/jdbc.properties" );
+ Properties jProps = loadPropertiesFrom( "/jspwiki-custom.properties" );
conn = DriverManager.getConnection( jProps.getProperty( "jdbc.driver.url" ),
jProps.getProperty( "jdbc.admin.id" ),
jProps.getProperty( "jdbc.admin.password" ) );
Copied: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties (from r1514321, jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/jspwiki-custom.properties)
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties?p2=jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties&p1=jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/jspwiki-custom.properties&r1=1514321&r2=1514392&rev=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties Thu Aug 15 17:35:47 2013
@@ -52,3 +52,15 @@ log4j.appender.SecurityAppender.layout.C
log4j.appender.TestContainerLog = org.apache.log4j.RollingFileAppender
log4j.appender.TestContainerLog.layout = org.apache.log4j.PatternLayout
log4j.appender.TestContainerLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
+
+server.port=9001
+server.database.0=file:jspwiki.hsqldb
+server.dbname.0=jspwiki
+
+jdbc.admin.id=SA
+jdbc.admin.password=
+jdbc.driver.class=org.hsqldb.jdbcDriver
+jdbc.driver.id=hsql
+jdbc.driver.url=jdbc\:hsqldb\:hsql\://localhost/jspwiki
+jdbc.user.id=jspwiki
+jdbc.user.password=password
Modified: jspwiki/trunk/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/pom.xml?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/pom.xml Thu Aug 15 17:35:47 2013
@@ -34,12 +34,12 @@
<packaging>pom</packaging>
<modules>
- <!--module>jspwiki-selenium-tests</module--> <!-- not really necessary; just in case if some day we need to reference the artifact... -->
+ <module>jspwiki-selenium-tests</module>
<module>jspwiki-it-test-custom</module>
- <module>jspwiki-it-test-custom-absolute-urls</module>
- <module>jspwiki-it-test-container</module>
+ <!--module>jspwiki-it-test-custom-absolute-urls</module>
<module>jspwiki-it-test-custom-jdbc</module>
- <module>jspwiki-it-test-container-jdbc</module>
+ <module>jspwiki-it-test-container</module>
+ <module>jspwiki-it-test-container-jdbc</module-->
</modules>
<profiles>
@@ -54,19 +54,18 @@
</testResource>
</testResources>
+ <resources>
+ <resource><!-- this enables tests reuse [2/2] -->
+ <directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<pluginManagement>
<plugins>
- <plugin><!-- this enables tests reuse [2/2] -->
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
- <configuration>
- <webResources>
- <resource>
- <directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
</plugin>
<plugin> <!-- exec-maven-plugin does not accept forked executions (!) -->
@@ -86,7 +85,7 @@
<arg value="${compile_classpath}" />
<arg value="org.apache.wiki.HsqlDbUtils"/>
<arg value="setUp" />
- <arg value="${project.basedir}/target/classes/hsql-userdb-setup.ddl" />
+ <arg value="jspwiki-selenium-tests/src/main/config/hsql-userdb-setup.ddl" />
</exec>
</target>
</configuration>
@@ -105,7 +104,7 @@
<arg value="${compile_classpath}" />
<arg value="org.apache.wiki.HsqlDbUtils"/>
<arg value="tearDown" />
- <arg value="${project.basedir}/target/classes/hsql-userdb-teardown.ddl" />
+ <arg value="jspwiki-selenium-tests/src/main/config/hsql-userdb-teardown.ddl" />
</exec>
</target>
</configuration>
@@ -149,7 +148,7 @@
<phase>pre-integration-test</phase>
<configuration>
<additionalConfigFilesDir>
- ${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf
+ jspwiki-selenium-tests/src/main/config/tomcatconf
</additionalConfigFilesDir>
<fork>true</fork>
<systemProperties>
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Thu Aug 15 17:35:47 2013
@@ -1,5 +1,17 @@
Title: Changelog
+#### 2013-08-14 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-39
+
+* Cleaned out unused config in IT tests, centralized common config
+ to Selenium IT module's custom properties file.
+
+* Patches to the three non-JDBC IT tests made so they're now all running
+ except for one test (RenameProfile), two JDBC IT tests still inoperative.
+
+* Removed config references to long-discontinued "jspwiki.admin.user" value.
+
#### 2013-08-13 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-38
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Thu Aug 15 17:35:47 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-38
\ No newline at end of file
+JSPWiki v2.10.0-svn-39
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Thu Aug 15 17:35:47 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 = "39";
+ public static final String BUILD = "40";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java Thu Aug 15 17:35:47 2013
@@ -89,7 +89,7 @@ public class HsqlDbUtils
{
// start Hypersonic server
- Properties hProps = loadPropertiesFrom( "target/test-classes/jdbc.properties" );
+ Properties hProps = loadPropertiesFrom( "target/test-classes/jspwiki-custom.properties" );
hsqlServer = new Server();
hsqlServer.setSilent(true); // be quiet during junit tests
@@ -170,7 +170,7 @@ public class HsqlDbUtils
Connection getConnection() throws IOException, SQLException
{
Connection conn;
- Properties jProps = loadPropertiesFrom( "target/test-classes/jdbc.properties" );
+ Properties jProps = loadPropertiesFrom( "target/test-classes/jspwiki-custom.properties" );
conn = DriverManager.getConnection( jProps.getProperty( "jdbc.driver.url" ),
jProps.getProperty( "jdbc.admin.id" ),
jProps.getProperty( "jdbc.admin.password" ) );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java Thu Aug 15 17:35:47 2013
@@ -73,7 +73,7 @@ public class JDBCGroupDatabaseTest exten
// ignore
}
Context ctx = (Context) initCtx.lookup( "java:comp/env" );
- DataSource ds = new TestJDBCDataSource( new File( "target/test-classes/jdbc.properties" ) );
+ DataSource ds = new TestJDBCDataSource( new File( "target/test-classes/jspwiki-custom.properties" ) );
ctx.bind( JDBCGroupDatabase.DEFAULT_GROUPDB_DATASOURCE, ds );
// Get the JDBC connection and init tables
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java Thu Aug 15 17:35:47 2013
@@ -97,7 +97,7 @@ public class JDBCUserDatabaseTest extend
// ignore
}
Context ctx = (Context) initCtx.lookup( "java:comp/env" );
- DataSource ds = new TestJDBCDataSource( new File( "target/test-classes/jdbc.properties" ) );
+ DataSource ds = new TestJDBCDataSource( new File( "target/test-classes/jspwiki-custom.properties" ) );
ctx.bind( JDBCUserDatabase.DEFAULT_DB_JNDI_NAME, ds );
// Get the JDBC connection and init tables
Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties Thu Aug 15 17:35:47 2013
@@ -66,3 +66,16 @@ jspwiki.approver.workflow.bar=Admin
#mail.from = JSPWiki <JS...@localhost>
#mail.smtp.account =
#mail.smtp.password =
+
+# for JDBC tests
+server.port=9001
+server.database.0=file:target/jspwiki.hsqldb
+server.dbname.0=jspwiki
+
+jdbc.admin.id=SA
+jdbc.admin.password=
+jdbc.driver.class=org.hsqldb.jdbcDriver
+jdbc.driver.id=hsql
+jdbc.driver.url=jdbc\:hsqldb\:hsql\://localhost/jspwiki
+jdbc.user.id=jspwiki
+jdbc.user.password=password
Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.policy
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.policy?rev=1514392&r1=1514391&r2=1514392&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.policy (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.policy Thu Aug 15 17:35:47 2013
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-// $Id: jspwiki.policy,v 1.11 2007-05-29 05:18:53 arj Exp $
+// $Id: jspwiki.policy,v 1.23 2007-07-06 10:36:36 jalkanen Exp $
//
// This file contains the local security policy for JSPWiki.
// It provides the permissions rules for the JSPWiki
@@ -26,12 +26,12 @@
// You can also use the standard Java 2 security policy mechanisms
// to create a consolidated 'global policy' (JVM-wide) that will be checked first,
// before this local policy. This is ideal for situations in which you are
-// running multiple instances of JSPWiki in your web container.
-// To set a global security policy for all running instances of JSPWiki,
+// running multiple instances of JSPWiki in your web container.
+// To set a global security policy for all running instances of JSPWiki,
// you will need to specify the location of the global policy by setting the
// JVM system property 'java.security.policy' in the command line script
-// you use to start your web container. See the documentation
-// pages at http://doc.jspwiki.org/2.4/wiki/InstallingJSPWiki. If you
+// you use to start your web container. See the documentation
+// pages at http://doc.jspwiki.org/2.4/wiki/InstallingJSPWiki. If you
// don't know what this means, don't worry about it.
//
// Also, if you are running JSPWiki with a security policy, you will probably
@@ -42,7 +42,7 @@
// The first policy block grants privileges that all users need, regardless of
// the roles or groups they belong to. Everyone can register with the wiki and
-// log in. Everyone can edit their profile after they authenticate.
+// log in. Everyone can edit their profile after they authenticate.
// Everyone can also view all wiki pages unless otherwise protected by an ACL.
// If that seems too loose for your needs, you can restrict page-viewing
// privileges by moving the PagePermission 'view' grant to one of the other blocks.
@@ -58,10 +58,13 @@ grant principal org.apache.wiki.auth.aut
// The second policy block is extremely loose, and unsuited for public-facing wikis.
// Anonymous users are allowed to create, edit and comment on all pages.
//
-// Note: For Internet-facing wikis, you are strongly advised to remove the
-// lines containing the "edit" and "createPages" permissions; this will make
+// Note: For Internet-facing wikis, you are strongly advised to remove the
+// lines containing the "modify" and "createPages" permissions; this will make
// the wiki read-only for anonymous users.
+// Note that "modify" implies *both* "edit" and "upload", so if you wish to
+// allow editing only, then replace "modify" with "edit".
+
grant principal org.apache.wiki.auth.authorize.Role "Anonymous" {
permission org.apache.wiki.auth.permissions.PagePermission "*:*", "edit";
permission org.apache.wiki.auth.permissions.WikiPermission "*", "createPages";
@@ -69,7 +72,8 @@ grant principal org.apache.wiki.auth.aut
// This next policy block is also pretty loose. It allows users who claim to
-// be someone (via their cookie) to create, edit and comment on all pages.
+// be someone (via their cookie) to create, edit and comment on all pages,
+// as well as upload files.
// They can also view the membership list of groups.
grant principal org.apache.wiki.auth.authorize.Role "Asserted" {
@@ -79,7 +83,7 @@ grant principal org.apache.wiki.auth.aut
};
-// Authenticated users can do most things: view, create, edit and
+// Authenticated users can do most things: view, create, edit and
// comment on all pages; upload files to existing ones; create and edit
// wiki groups; and rename existing pages. Authenticated users can also
// edit groups they are members of.
@@ -92,10 +96,10 @@ grant principal org.apache.wiki.auth.aut
};
-// Administrators (principals or roles possessing AllPermission)
-// are allowed to delete any page, and can edit, rename and delete
-// groups. You should match the permission target (here, 'JSPWiki')
-// with the value of the 'jspwiki.applicationName' property in
+// Administrators (principals or roles possessing AllPermission)
+// are allowed to delete any page, and can edit, rename and delete
+// groups. You should match the permission target (here, 'JSPWiki')
+// with the value of the 'jspwiki.applicationName' property in
// jspwiki.properties. Two administative groups are set up below:
// the wiki group "Admin" (stored by default in wiki page GroupAdmin)
// and the container role "Admin" (managed by the web container).