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 00:21:25 UTC
svn commit: r1514069 - in /jspwiki/trunk: ./ jspwiki-it-tests/
jspwiki-it-tests/jspwiki-it-test-container-jdbc/
jspwiki-it-tests/jspwiki-it-test-container/
jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/
jspwiki-it-tests/jspwiki-it-test-custom-a...
Author: gmazza
Date: Wed Aug 14 22:21:25 2013
New Revision: 1514069
URL: http://svn.apache.org/r1514069
Log:
More cleanup of IT tests, non-JDBC tests all working except for RenameProfile.
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/jspwiki-custom.properties
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html
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/resources/jspwiki-custom.properties
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Wed Aug 14 22:21:25 2013
@@ -1,3 +1,15 @@
+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-it-tests/jspwiki-it-test-container-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml Wed Aug 14 22:21:25 2013
@@ -36,13 +36,9 @@
<!-- this enables tests reuse [3/3] -->
<it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
- <it-jspwiki.authorizer>org.apache.wiki.auth.authorize.WebContainerAuthorizer</it-jspwiki.authorizer>
<it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.JDBCGroupDatabase</it-jspwiki.groupdatabase>
- <it-jspwiki.login.throttling>false</it-jspwiki.login.throttling>
- <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
<it-jspwiki.userdatabase>org.apache.wiki.auth.user.JDBCUserDatabase</it-jspwiki.userdatabase>
- <it-jspwiki.userdatabase.hashPrefix>false</it-jspwiki.userdatabase.hashPrefix>
- <it-jspwiki-x.securityconfig.enable>true</it-jspwiki-x.securityconfig.enable>
+ <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
</properties>
<build>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container/pom.xml?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container/pom.xml Wed Aug 14 22:21:25 2013
@@ -36,13 +36,9 @@
<!-- this enables tests reuse [3/3] -->
<it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
- <it-jspwiki.authorizer>org.apache.wiki.auth.authorize.WebContainerAuthorizer</it-jspwiki.authorizer>
<it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
- <it-jspwiki.login.throttling>false</it-jspwiki.login.throttling>
- <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
<it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
- <it-jspwiki.userdatabase.hashPrefix>false</it-jspwiki.userdatabase.hashPrefix>
- <it-jspwiki-x.securityconfig.enable>true</it-jspwiki-x.securityconfig.enable>
+ <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
</properties>
<build>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml Wed Aug 14 22:21:25 2013
@@ -36,13 +36,9 @@
<!-- this enables tests reuse [3/3] -->
<it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
- <it-jspwiki.authorizer>org.apache.wiki.auth.authorize.WebContainerAuthorizer</it-jspwiki.authorizer>
<it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
- <it-jspwiki.login.throttling>false</it-jspwiki.login.throttling>
- <it-jspwiki.referenceStyle>absolute</it-jspwiki.referenceStyle>
<it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
- <it-jspwiki.userdatabase.hashPrefix>false</it-jspwiki.userdatabase.hashPrefix>
- <it-jspwiki-x.securityconfig.enable>true</it-jspwiki-x.securityconfig.enable>
+ <it-jspwiki.referenceStyle>absolute</it-jspwiki.referenceStyle>
</properties>
<build>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml Wed Aug 14 22:21:25 2013
@@ -221,7 +221,6 @@
<error-code>403</error-code>
<location>/error/Forbidden.html</location>
</error-page>
-
<resource-ref>
<description>
@@ -251,129 +250,5 @@
Container
</res-auth>
</resource-ref>
-
-
- <!-- REMOVE ME TO ENABLE JAVAMAIL
- <resource-ref>
- <description>Resource reference to a container-managed JNDI JavaMail factory for sending e-mails.</description>
- <res-ref-name>mail/Session</res-ref-name>
- <res-type>javax.mail.Session</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- REMOVE ME TO ENABLE JAVAMAIL -->
-
- <!--
- CONTAINER-MANAGED AUTHENTICATION & AUTHORIZATION
-
- Here we define the users which are allowed to access JSPWiki.
- These restrictions cause the web container to apply further
- contraints to the default security policy in jspwiki.policy,
- and should be suitable for a corporate intranet or public wiki.
-
- In particular, the restrictions below allow all users to
- read documents, but only Authenticated users can comment
- on or edit them (i.e., access the Edit.jsp page).
- Users with the role Admin are the only persons who can
- delete pages.
-
- To implement this policy, the container enforces two web
- resource constraints: one for the Administrator resources,
- and one for Authenticated users. Note that the "role-name"
- values are significant and should match the role names
- retrieved by your web container's security realm. The roles
- of "Admin" and "Authenticated" are assigned by the web
- container at login time.
-
- For example, if you are using Tomcat's built-in "memory realm",
- you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
- and add the desired actual user accounts. Each user must possess
- one or both of the Admin or Authenticated roles. For other realm
- types, consult your web container's documentation.
-
- Alternatively, you could also replace all references to
- "Authenticated" and "Admin" with role names that match those
- returned by your container's security realm. We don't care
- either way, as long as they match.
-
- Note that accessing protected resources will cause your
- container to try to use SSL (default port for Tomcat is 8443)
- to secure the web session. This, of course, assumes your
- web container (or web server) is configured with SSL support.
- If you do not wish to use SSL, remove the "user-data-constraint"
- elements.
- -->
-
- <!-- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Administrative Area</web-resource-name>
- <url-pattern>/Delete.jsp</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Admin</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Authenticated area</web-resource-name>
- <url-pattern>/Edit.jsp</url-pattern>
- <url-pattern>/Comment.jsp</url-pattern>
- <url-pattern>/Login.jsp</url-pattern>
- <url-pattern>/NewGroup.jsp</url-pattern>
- <url-pattern>/Rename.jsp</url-pattern>
- <url-pattern>/Upload.jsp</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>HEAD</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>Read-only Area</web-resource-name>
- <url-pattern>/attach</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
-
- <auth-constraint>
- <role-name>Admin</role-name>
- <role-name>Authenticated</role-name>
- </auth-constraint>
-
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>FORM</auth-method>
- <form-login-config>
- <form-login-page>/LoginForm.jsp</form-login-page>
- <form-error-page>/LoginForm.jsp</form-error-page>
- </form-login-config>
- </login-config>
-
- <security-role>
- <description>
- This logical role includes all authenticated users
- </description>
- <role-name>Authenticated</role-name>
- </security-role>
-
- <security-role>
- <description>
- This logical role includes all administrative users
- </description>
- <role-name>Admin</role-name>
- </security-role>
-
- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH -->
-
</web-app>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml Wed Aug 14 22:21:25 2013
@@ -35,14 +35,10 @@
<properties> <!-- values injected at jspwiki.properties & selenium templates -->
<!-- this enables tests reuse [3/3] -->
<it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
-
- <it-jspwiki.authorizer>org.apache.wiki.auth.authorize.WebContainerAuthorizer</it-jspwiki.authorizer>
+
<it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.JDBCGroupDatabase</it-jspwiki.groupdatabase>
- <it-jspwiki.login.throttling>false</it-jspwiki.login.throttling>
- <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
<it-jspwiki.userdatabase>org.apache.wiki.auth.user.JDBCUserDatabase</it-jspwiki.userdatabase>
- <it-jspwiki.userdatabase.hashPrefix>false</it-jspwiki.userdatabase.hashPrefix>
- <it-jspwiki-x.securityconfig.enable>true</it-jspwiki-x.securityconfig.enable>
+ <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
</properties>
<build>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml Wed Aug 14 22:21:25 2013
@@ -221,7 +221,6 @@
<error-code>403</error-code>
<location>/error/Forbidden.html</location>
</error-page>
-
<resource-ref>
<description>
@@ -251,129 +250,5 @@
Container
</res-auth>
</resource-ref>
-
-
- <!-- REMOVE ME TO ENABLE JAVAMAIL
- <resource-ref>
- <description>Resource reference to a container-managed JNDI JavaMail factory for sending e-mails.</description>
- <res-ref-name>mail/Session</res-ref-name>
- <res-type>javax.mail.Session</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- REMOVE ME TO ENABLE JAVAMAIL -->
-
- <!--
- CONTAINER-MANAGED AUTHENTICATION & AUTHORIZATION
-
- Here we define the users which are allowed to access JSPWiki.
- These restrictions cause the web container to apply further
- contraints to the default security policy in jspwiki.policy,
- and should be suitable for a corporate intranet or public wiki.
-
- In particular, the restrictions below allow all users to
- read documents, but only Authenticated users can comment
- on or edit them (i.e., access the Edit.jsp page).
- Users with the role Admin are the only persons who can
- delete pages.
-
- To implement this policy, the container enforces two web
- resource constraints: one for the Administrator resources,
- and one for Authenticated users. Note that the "role-name"
- values are significant and should match the role names
- retrieved by your web container's security realm. The roles
- of "Admin" and "Authenticated" are assigned by the web
- container at login time.
-
- For example, if you are using Tomcat's built-in "memory realm",
- you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
- and add the desired actual user accounts. Each user must possess
- one or both of the Admin or Authenticated roles. For other realm
- types, consult your web container's documentation.
-
- Alternatively, you could also replace all references to
- "Authenticated" and "Admin" with role names that match those
- returned by your container's security realm. We don't care
- either way, as long as they match.
-
- Note that accessing protected resources will cause your
- container to try to use SSL (default port for Tomcat is 8443)
- to secure the web session. This, of course, assumes your
- web container (or web server) is configured with SSL support.
- If you do not wish to use SSL, remove the "user-data-constraint"
- elements.
- -->
-
- <!-- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Administrative Area</web-resource-name>
- <url-pattern>/Delete.jsp</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Admin</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Authenticated area</web-resource-name>
- <url-pattern>/Edit.jsp</url-pattern>
- <url-pattern>/Comment.jsp</url-pattern>
- <url-pattern>/Login.jsp</url-pattern>
- <url-pattern>/NewGroup.jsp</url-pattern>
- <url-pattern>/Rename.jsp</url-pattern>
- <url-pattern>/Upload.jsp</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>HEAD</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>Read-only Area</web-resource-name>
- <url-pattern>/attach</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
-
- <auth-constraint>
- <role-name>Admin</role-name>
- <role-name>Authenticated</role-name>
- </auth-constraint>
-
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>FORM</auth-method>
- <form-login-config>
- <form-login-page>/LoginForm.jsp</form-login-page>
- <form-error-page>/LoginForm.jsp</form-error-page>
- </form-login-config>
- </login-config>
-
- <security-role>
- <description>
- This logical role includes all authenticated users
- </description>
- <role-name>Authenticated</role-name>
- </security-role>
-
- <security-role>
- <description>
- This logical role includes all administrative users
- </description>
- <role-name>Admin</role-name>
- </security-role>
-
- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH -->
-
</web-app>
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=1514069&r1=1514068&r2=1514069&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 Wed Aug 14 22:21:25 2013
@@ -35,14 +35,10 @@
<properties> <!-- values injected at jspwiki.properties & selenium templates -->
<!-- this enables tests reuse [3/3] -->
<it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
-
- <it-jspwiki.authorizer>org.apache.wiki.auth.authorize.WebContainerAuthorizer</it-jspwiki.authorizer>
+
<it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
- <it-jspwiki.login.throttling>false</it-jspwiki.login.throttling>
- <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
<it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
- <it-jspwiki.userdatabase.hashPrefix>false</it-jspwiki.userdatabase.hashPrefix>
- <it-jspwiki-x.securityconfig.enable>true</it-jspwiki-x.securityconfig.enable>
+ <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
</properties>
<build>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml Wed Aug 14 22:21:25 2013
@@ -222,7 +222,6 @@
<location>/error/Forbidden.html</location>
</error-page>
-
<resource-ref>
<description>
Resource reference to JNDI factory for the JDBCUserDatabase.
@@ -251,129 +250,5 @@
Container
</res-auth>
</resource-ref>
-
- <!-- REMOVE ME TO ENABLE JAVAMAIL
- <resource-ref>
- <description>Resource reference to a container-managed JNDI JavaMail factory for sending e-mails.</description>
- <res-ref-name>mail/Session</res-ref-name>
- <res-type>javax.mail.Session</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- REMOVE ME TO ENABLE JAVAMAIL -->
-
- <!--
- CONTAINER-MANAGED AUTHENTICATION & AUTHORIZATION
-
- Here we define the users which are allowed to access JSPWiki.
- These restrictions cause the web container to apply further
- contraints to the default security policy in jspwiki.policy,
- and should be suitable for a corporate intranet or public wiki.
-
- In particular, the restrictions below allow all users to
- read documents, but only Authenticated users can comment
- on or edit them (i.e., access the Edit.jsp page).
- Users with the role Admin are the only persons who can
- delete pages.
-
- To implement this policy, the container enforces two web
- resource constraints: one for the Administrator resources,
- and one for Authenticated users. Note that the "role-name"
- values are significant and should match the role names
- retrieved by your web container's security realm. The roles
- of "Admin" and "Authenticated" are assigned by the web
- container at login time.
-
- For example, if you are using Tomcat's built-in "memory realm",
- you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
- and add the desired actual user accounts. Each user must possess
- one or both of the Admin or Authenticated roles. For other realm
- types, consult your web container's documentation.
-
- Alternatively, you could also replace all references to
- "Authenticated" and "Admin" with role names that match those
- returned by your container's security realm. We don't care
- either way, as long as they match.
-
- Note that accessing protected resources will cause your
- container to try to use SSL (default port for Tomcat is 8443)
- to secure the web session. This, of course, assumes your
- web container (or web server) is configured with SSL support.
- If you do not wish to use SSL, remove the "user-data-constraint"
- elements.
- -->
-
- <!-- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Administrative Area</web-resource-name>
- <url-pattern>/Delete.jsp</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Admin</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Authenticated area</web-resource-name>
- <url-pattern>/Edit.jsp</url-pattern>
- <url-pattern>/Comment.jsp</url-pattern>
- <url-pattern>/Login.jsp</url-pattern>
- <url-pattern>/NewGroup.jsp</url-pattern>
- <url-pattern>/Rename.jsp</url-pattern>
- <url-pattern>/Upload.jsp</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>HEAD</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
-
- <web-resource-collection>
- <web-resource-name>Read-only Area</web-resource-name>
- <url-pattern>/attach</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
-
- <auth-constraint>
- <role-name>Admin</role-name>
- <role-name>Authenticated</role-name>
- </auth-constraint>
-
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>FORM</auth-method>
- <form-login-config>
- <form-login-page>/LoginForm.jsp</form-login-page>
- <form-error-page>/LoginForm.jsp</form-error-page>
- </form-login-config>
- </login-config>
-
- <security-role>
- <description>
- This logical role includes all authenticated users
- </description>
- <role-name>Authenticated</role-name>
- </security-role>
-
- <security-role>
- <description>
- This logical role includes all administrative users
- </description>
- <role-name>Admin</role-name>
- </security-role>
-
- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH -->
-
</web-app>
Modified: 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/WEB-INF/classes/jspwiki-custom.properties?rev=1514069&r1=1514068&r2=1514069&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/WEB-INF/classes/jspwiki-custom.properties Wed Aug 14 22:21:25 2013
@@ -14,27 +14,12 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-#
-# Property file for tests.
-#
-#
-# Which page provider class to use. Possibilities are:
-#
-# RCSFileProvider for simple RCS-based file storage
-# FileSystemProvider for simple pure file storage with no version information
-#
-
#
# VALUES INJECTED BY WEB TESTS
#
-jspwiki.authorizer = ${it-jspwiki.authorizer}
jspwiki.groupdatabase = ${it-jspwiki.groupdatabase}
-jspwiki.login.throttling = ${it-jspwiki.login.throttling}
jspwiki.referenceStyle = ${it-jspwiki.referenceStyle}
jspwiki.userdatabase = ${it-jspwiki.userdatabase}
-jspwiki.userdatabase.hashPrefix = ${it-jspwiki.userdatabase.hashPrefix}
-jspwiki-x.securityconfig.enable = ${it-jspwiki-x.securityconfig.enable}
jspwiki.baseURL = http://localhost:8080/${project.artifactId}/
jspwiki.fileSystemProvider.pageDir = ./${project.artifactId}/target/test-classes/test-repo
@@ -44,68 +29,26 @@ log4j.appender.FileLog.File
log4j.appender.TestContainerLog.File = ./${project.artifactId}/target/test-classes/container-${project.artifactId}.log
log4j.appender.SecurityAppender.File = ./${project.artifactId}/target/test-classes/security-${project.artifactId}.log
+#
+# Other overrides of standard jspwiki.properties file
+#
jspwiki.xmlGroupDatabaseFile = ${it-jspwiki.context}/target/test-classes/groupdatabase.xml
jspwiki.xmlUserDatabaseFile = ${it-jspwiki.context}/target/test-classes/userdatabase.xml
-
+jspwiki.login.throttling = false
+jspwiki-x.securityconfig.enable = true
jspwiki.translatorReader.camelCaseLinks = true
jspwiki.breakTitleWithSpaces = true
-jspwiki.translatorReader.matchEnglishPlurals = true
jspwiki.translatorReader.useOutlinkImage = false
jspwiki.encoding = ISO-8859-1
jspwiki.searchProvider = BasicSearchProvider
-#
-# Special page references.
-#
-# The URL is relative to Wiki.jsp. However, if you use
-# a full, absolute URL, you can also do that.
-#
-# Example to redirect all requests to a page called 'OriginalWiki'
-# to the original wikiwiki at http://c2.com/cgi/wiki
-#
-# jspwiki.specialPage.OriginalWiki = http://c2.com/cgi/wiki
-#
-jspwiki.specialPage.RecentChanges = RecentChanges.jsp
-jspwiki.specialPage.Search = Search.jsp
-
-#
-# Define which image types are inlined.
-# These are your standard glob expressions (just like in your
-# Windows or UNIX shells).
-#
-
-jspwiki.translatorReader.inlinePattern.1 = *.jpg
-jspwiki.translatorReader.inlinePattern.2 = *.png
-jspwiki.translatorReader.inlinePattern.3 = http://images.com/*
-
-#
-# Security: use standard providers for user/group auth, user management
-# and ACLs. Use a test userdatabase for storing users.
-#
-jspwiki.admin.user = admin
-
log4j.logger.SecurityLog=INFO, SecurityAppender
log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
-log4j.appender.SecurityAppender.MaxFileSize = 10MB
-log4j.appender.SecurityAppender.MaxBackupIndex = 14
log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
log4j.appender.TestContainerLog = org.apache.log4j.RollingFileAppender
-log4j.appender.TestContainerLog.MaxFileSize = 10MB
-log4j.appender.TestContainerLog.MaxBackupIndex = 14
log4j.appender.TestContainerLog.layout = org.apache.log4j.PatternLayout
log4j.appender.TestContainerLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
-
-
-# JavaMail properties
-mail.smtp.host = 127.0.0.1
-mail.smtp.port = 25
-mail.from = JSPWiki <JS...@localhost>
-
-# Workflow test properties
-jspwiki.approver.workflow.saveWikiPage=
-jspwiki.approver.workflow.foo=janne
-jspwiki.approver.workflow.bar=Admin
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/AnonymousViewImage.html Wed Aug 14 22:21:25 2013
@@ -37,7 +37,7 @@
<tr><td>open</td> <td>${imgurl}</td> <td> </td></tr>
<tr><td>assertBodyText</td> <td></td> <td> </td></tr>
- <tr><td>store</td> <td>../images/jspwiki_logo_ss.png</td> <td>imgurl</td></tr>
+ <tr><td>store</td> <td>${it_baseUrl}/images/jspwiki_logo_ss.png</td> <td>imgurl</td></tr>
<tr><td>open</td> <td>${imgurl}</td> <td> </td></tr>
<tr><td>assertNotBodyText</td> <td></td> <td> </td></tr>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/selenium/Logout.html Wed Aug 14 22:21:25 2013
@@ -46,7 +46,7 @@
<tr><td>verifyTextPresent</td> <td>G’day</td> <td> </td></tr>
<tr><td>verifyTextPresent</td> <td>(authenticated)</td><td> </td></tr>
- <tr><td>assertCookieByName</td> <td>JSPWikiAssertedName</td> <td>"Janne+Jalkanen"</td></tr>
+ <tr><td>assertCookieByName</td> <td>JSPWikiAssertedName</td> <td>Janne+Jalkanen</td></tr>
<!-- Log out; we should NOT see any asserted identities -->
<tr><td>assertElementPresent</td> <td>link=Log out</td> <td></td></tr>
Modified: jspwiki/trunk/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/pom.xml?rev=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/pom.xml Wed Aug 14 22:21:25 2013
@@ -37,8 +37,8 @@
<!--module>jspwiki-selenium-tests</module--> <!-- not really necessary; just in case if some day we need to reference the artifact... -->
<module>jspwiki-it-test-custom</module>
<module>jspwiki-it-test-custom-absolute-urls</module>
- <module>jspwiki-it-test-custom-jdbc</module>
<module>jspwiki-it-test-container</module>
+ <module>jspwiki-it-test-custom-jdbc</module>
<module>jspwiki-it-test-container-jdbc</module>
</modules>
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=1514069&r1=1514068&r2=1514069&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 Wed Aug 14 22:21:25 2013
@@ -1,5 +1,13 @@
Title: Changelog
+#### 2013-08-13 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-38
+
+* Updated all the test/*-custom.properties files, removed all non-necessary configuration items
+
+* Removed no-longer-needed file filtering from the jspwiki WAR pom.
+
#### 2013-08-11 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-37
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=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Wed Aug 14 22:21:25 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-37
\ No newline at end of file
+JSPWiki v2.10.0-svn-38
\ 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=1514069&r1=1514068&r2=1514069&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 Wed Aug 14 22:21:25 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 = "38";
+ public static final String BUILD = "39";
/**
* This is the generic version string you should use
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=1514069&r1=1514068&r2=1514069&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties Wed Aug 14 22:21:25 2013
@@ -38,7 +38,6 @@ jspwiki.authorizer=org.apache.wiki.TestA
#
jspwiki.xmlGroupDatabaseFile = target/test-classes/groupdatabase.xml
jspwiki.xmlUserDatabaseFile = target/test-classes/userdatabase.xml
-jspwiki.admin.user = admin
log4j.appender.FileLog.File = target/test-classes/jspwikitests.log
log4j.logger.SecurityLog=INFO, SecurityAppender