jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1486410 - in /incubator/jspwiki/branches/MVN3_BRANCH: ./ jspwiki-it-tests/ jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/ jspwiki-it-tests/jspwiki-it-test-custom-jdbc/ jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/ jspwiki-it-te...
Date Sun, 26 May 2013 11:51:53 GMT
Author: juanpablo
Date: Sun May 26 11:51:53 2013
New Revision: 1486410

URL: http://svn.apache.org/r1486410
Log:
some cleanup before merging trunk
- version goes to 2.9.2-SNAPSHOT
- added jspwiki-it-test-custom-jdbc selenium test executions, which wasn't as straightforward as I thought it would be
- some cleanup on jspwiki-it*/pom.xml 

Added:
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-setup.ddl
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-teardown.ddl
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties
Modified:
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
    incubator/jspwiki/branches/MVN3_BRANCH/pom.xml

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml?rev=1486410&r1=1486409&r2=1486410&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml Sun May 26 11:51:53 2013
@@ -24,7 +24,7 @@
   <parent> <!-- this enables tests reuse [1/3] -->
     <groupId>org.apache.jspwiki.it</groupId>
     <artifactId>jspwiki-it-builder</artifactId>
-    <version>2.9.1-SNAPSHOT</version>
+    <version>2.9.2-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.incubator.jspwiki.it</groupId>
@@ -32,7 +32,6 @@
   <modelVersion>4.0.0</modelVersion>
   <name>jspwiki-it-test-custom-absolute-urls</name>
   <description>selenium tests execution for jspwiki-it-test-custom-absolute-urls (custom auth, absolute URLs)</description>
-  <version>2.9.1-SNAPSHOT</version>
   <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
   
   <properties> <!-- values injected at jspwiki.properties & selenium templates -->
@@ -52,10 +51,6 @@
     <finalName>${project.artifactId}</finalName>
     <plugins> <!-- selenium test execution -->
       <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-      </plugin>
-      
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>selenium-maven-plugin</artifactId>
       </plugin>

Added: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml?rev=1486410&view=auto
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml (added)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml Sun May 26 11:51:53 2013
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns              = "http://maven.apache.org/POM/4.0.0"
+         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">
+
+  <parent> <!-- this enables tests reuse [1/3] -->
+    <groupId>org.apache.jspwiki.it</groupId>
+    <artifactId>jspwiki-it-builder</artifactId>
+    <version>2.9.2-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>org.apache.incubator.jspwiki.it</groupId>
+  <artifactId>jspwiki-it-test-custom-jdbc</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <name>jspwiki-it-test-custom-jdbc</name>
+  <description>selenium tests execution for jspwiki-it-test-custom (custom auth, JDBC database)</description>
+  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
+  
+  <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>
+  </properties>
+  
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    
+    <!-- So we can reuse o.a.w.HsqlDbUtils, but it should be loaded as a dependency (i.e.: jspwiki-test-support, 
+         alongside TestEngine, and other test classes). Btw, this HsqlDbUtils is slightly modified, as it 
+         reads all files from target/classes + has a public static void main(String[]) method -->
+    <sourceDirectory>${project.basedir}/../jspwiki-selenium-tests/src/main/java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+      <resource>
+        <directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
+      </resource>
+    </resources>
+    
+    <plugins> <!-- selenium test execution -->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <configuration>
+          <contextFile>target/${project.artifactId}/WEB-INF/tomcat7-context.xml</contextFile>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.10</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>    
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Added: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml?rev=1486410&view=auto
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml Sun May 26 11:51:53 2013
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+        version="2.4">
+
+   <description>
+       JSPWiki is an open source JSP-based WikiClone.  It is licensed
+       under the Apache 2.0 license.
+
+       For more information, please come to http://www.jspwiki.org/
+   </description>
+   <display-name>JSPWiki</display-name>
+
+   <!-- Resource bundle default location -->
+   <context-param>
+     <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+     <param-value>templates.default</param-value>
+   </context-param>
+
+   <!--
+      WikiServletFilter defines a servlet filter which filters all requests. It was
+      introduced in JSPWiki 2.4.
+
+      In 2.7/2.8, the WikiServlet filter also performs an important security function:
+      it sets authentication status based on container credentials. It should generally
+      execute first. Note that if you configure a filter *before* this one that returns
+      non-null values for getUserPrincipal() or getRemoteUser(), WikiSecurityFilter
+      will pick the credentials up, and set the user's WikiSession state to
+      "authenticated." WikiServletFlter will also set the WikiSession's' state
+      to "authenticated" if jspwiki.properties property "jspwiki.cookieAuthentication"
+      is set to true, and the user possesses the correct authentication cookie.
+
+      Lastly, if jspwiki.properties property "jspwiki.cookieAssertions" is set to true,
+      WikiServletFilter will also set WikiSession state to "asserted" if the user
+      possesses the correct "assertion cookie."
+   -->
+
+   <filter>
+      <filter-name>WikiServletFilter</filter-name>
+      <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class>
+   </filter>
+   <filter>
+      <filter-name>WikiJSPFilter</filter-name>
+      <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+       <filter-name>WikiServletFilter</filter-name>
+       <url-pattern>/attach/*</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+       <filter-name>WikiServletFilter</filter-name>
+       <url-pattern>/atom/*</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+       <filter-name>WikiServletFilter</filter-name>
+       <url-pattern>/RPCU/</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+       <filter-name>WikiServletFilter</filter-name>
+       <url-pattern>/RPC2/</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+       <filter-name>WikiServletFilter</filter-name>
+       <url-pattern>/JSON-RPC</url-pattern>
+   </filter-mapping> 
+   <filter-mapping>
+       <filter-name>WikiJSPFilter</filter-name>
+       <url-pattern>/wiki/*</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+       <filter-name>WikiJSPFilter</filter-name>
+       <url-pattern>*.jsp</url-pattern>
+   </filter-mapping>
+   
+   <!--
+       HttpSessionListener used for managing WikiSession's.
+     -->
+   <listener>
+      <listener-class>org.apache.wiki.auth.SessionMonitor</listener-class>
+   </listener>
+   
+   <!--
+       Now, let's define the XML-RPC interfaces.  You probably don't have to
+       touch these.
+
+       First, we'll define the standard XML-RPC interface.
+     -->
+   <servlet>
+       <servlet-name>XMLRPC</servlet-name>
+       <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>       
+       <init-param>
+           <param-name>handler</param-name>
+           <param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
+       </init-param>
+
+       <init-param>
+           <param-name>prefix</param-name>
+           <param-value>wiki</param-value>
+       </init-param>
+   </servlet>
+
+   <!--
+       OK, this then defines that our UTF-8 -capable server.
+     -->
+
+   <servlet>
+       <servlet-name>XMLRPC-UTF8</servlet-name>
+       <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>       
+       <init-param>
+           <param-name>handler</param-name>
+           <param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
+       </init-param>
+
+       <init-param>
+           <param-name>prefix</param-name>
+           <param-value>wiki</param-value>
+       </init-param>
+   </servlet>
+
+   <!-- JSON AJAX API -->
+   <servlet>
+       <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
+       <servlet-class>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-class>
+   </servlet>
+
+   <!-- Atom Publishing Protocol -->
+   <servlet>
+       <servlet-name>ATOM</servlet-name>
+       <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>       
+   </servlet>
+
+   <!-- Maps short URLS to JSPs; also, detects webapp shutdown. -->
+   <servlet>
+       <servlet-name>WikiServlet</servlet-name>
+       <servlet-class>org.apache.wiki.WikiServlet</servlet-class>       
+       <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <!--
+       Attachment exchange handler.
+     -->
+
+   <servlet>
+       <servlet-name>AttachmentServlet</servlet-name>
+       <servlet-class>org.apache.wiki.attachment.AttachmentServlet</servlet-class>
+   </servlet>
+
+   <!-- PLACEHOLDER FOR PRE-COMPILED JSP SERVLETS -->
+
+   <!--
+       And finally, let us tell the servlet container which
+       URLs should correspond to which XML RPC servlet.
+     -->
+
+   <!-- By default, this is disabled.  If you want to enabled it,
+        just uncomment the whole section. -->
+
+   <!--  REMOVE ME TO ENABLE XML-RPC
+
+   <servlet-mapping>
+       <servlet-name>XMLRPC</servlet-name>
+       <url-pattern>/RPC2/</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+       <servlet-name>XMLRPC-UTF8</servlet-name>
+       <url-pattern>/RPCU/</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+       <servlet-name>ATOM</servlet-name>
+       <url-pattern>/atom/*</url-pattern>
+   </servlet-mapping>
+
+   AND REMOVE ME TOO -->
+
+   <servlet-mapping>
+       <servlet-name>AttachmentServlet</servlet-name>
+       <url-pattern>/attach/*</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+       <servlet-name>WikiServlet</servlet-name>
+       <url-pattern>/wiki/*</url-pattern>
+   </servlet-mapping>
+   
+   <servlet-mapping>
+       <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
+       <url-pattern>/JSON-RPC</url-pattern>
+   </servlet-mapping>
+
+   <!-- This means that we don't have to use redirection
+        from index.html anymore.  Yay! -->
+   <welcome-file-list>
+       <welcome-file>Wiki.jsp</welcome-file>
+   </welcome-file-list>
+   
+   <!-- Error pages -->
+   <error-page>
+     <error-code>403</error-code>
+     <location>/error/Forbidden.html</location>
+   </error-page>
+
+   
+   <resource-ref>
+       <description>
+           Resource reference to JNDI factory for the JDBCUserDatabase.
+       </description>
+       <res-ref-name>
+           jdbc/UserDatabase
+       </res-ref-name>
+       <res-type>
+           javax.sql.DataSource
+       </res-type>
+       <res-auth>
+           Container
+       </res-auth>
+   </resource-ref>
+   <resource-ref>
+       <description>
+           Resource reference to JNDI factory for the JDBCGroupDatabase.
+       </description>
+       <res-ref-name>
+           jdbc/GroupDatabase
+       </res-ref-name>
+       <res-type>
+           javax.sql.DataSource
+       </res-type>
+       <res-auth>
+           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: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml?rev=1486410&r1=1486409&r2=1486410&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml Sun May 26 11:51:53 2013
@@ -24,7 +24,7 @@
   <parent> <!-- this enables tests reuse [1/3] -->
     <groupId>org.apache.jspwiki.it</groupId>
     <artifactId>jspwiki-it-builder</artifactId>
-    <version>2.9.1-SNAPSHOT</version>
+    <version>2.9.2-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.incubator.jspwiki.it</groupId>
@@ -32,7 +32,6 @@
   <modelVersion>4.0.0</modelVersion>
   <name>jspwiki-it-test-custom</name>
   <description>selenium tests execution for jspwiki-it-test-custom (custom auth, relative URLs)</description>
-  <version>2.9.1-SNAPSHOT</version>
   <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
   
   <properties> <!-- values injected at jspwiki.properties & selenium templates -->
@@ -51,9 +50,6 @@
   <build>
     <finalName>${project.artifactId}</finalName>
     <plugins> <!-- selenium test execution -->
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-      </plugin>
       
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1486410&r1=1486409&r2=1486410&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Sun May 26 11:51:53 2013
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
-    <version>2.9.1-SNAPSHOT</version>
+    <version>2.9.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   
@@ -33,5 +33,29 @@
   <modelVersion>4.0.0</modelVersion>
   <name>jspwiki-selenium-tests</name>
   <description>templates of selenium tests for jspwiki</description>
-  <version>2.9.1-SNAPSHOT</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.jspwiki</groupId>
+      <artifactId>jspwiki-war</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
 </project>
\ No newline at end of file

Added: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java?rev=1486410&view=auto
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java (added)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java Sun May 26 11:51:53 2013
@@ -0,0 +1,229 @@
+/* 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+ */
+package org.apache.wiki;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.hsqldb.Server;
+import org.hsqldb.util.SqlFile;
+
+
+/**
+ * Helper class to handle Hypersonic Server connections and SQL scripts executions.
+ * 
+ * Standard usage:
+ * <code>
+ * <ol>
+ *   <li>HsqlDbUtils hsqldbu = new HsqlDbUtils()</li>
+ *   <li>hsqldbu.start()</li>
+ *   <li>hsqldbu.exec( "target/etc/db/hsql/hsql-userdb-setup.ddl" )</li>
+ *   <li>hsqldbu.exec( "target/etc/db/hsql/hsql-userdb-teardown.ddl" )</li>
+ *   <li>hsqldbu.stop()</li>
+ * </ol>
+ * </code>
+ * There are also a couple of convenience methods for unit testing:
+ * <code>
+ * <ol>
+ *   <li>hsqldbu.setUp()</li>
+ *   <li>hsqldbu.tearDown()</li>
+ * </ol>
+ * </code>
+ */
+public class HsqlDbUtils
+{
+    
+    private static final Logger LOG = Logger.getLogger( HsqlDbUtils.class );
+    
+    Properties hProps = null;
+    Server hsqlServer = null;
+    
+    /**
+     * Convenience Hypersonic startup method for unit tests.
+     */
+    public void setUp() 
+    {
+        try
+        {
+            start();
+        }
+        catch( Exception e )
+        {
+            LOG.error( e.getMessage(), e );
+        }
+        exec( "./target/classes/hsql-userdb-setup.ddl" );
+    }
+    
+    /**
+     * Convenience Hypersonic shutdown method for unit tests.
+     */
+    public void tearDown() 
+    {
+        exec( "./target/classes/hsql-userdb-teardown.ddl" );
+        stop();
+    }
+    
+    /**
+     * Starts the Hypersonic server.
+     */
+    public void start() throws Exception
+    {
+        
+        // start Hypersonic server
+        Properties hProps = loadPropertiesFrom( "/jdbc.properties" );
+        
+        hsqlServer = new Server();
+        // pre-checks
+        hsqlServer.checkRunning( false ); // throws RuntimeException if running
+        
+        // configure
+        hsqlServer.setPort( Integer.valueOf( hProps.getProperty( "server.port" ) ) );
+        hsqlServer.setDatabaseName( 0, hProps.getProperty( "server.dbname.0" ) );
+        hsqlServer.setDatabasePath( 0, hProps.getProperty( "server.database.0" ) );
+        hsqlServer.start();
+        
+        Class.forName( "org.hsqldb.jdbcDriver" );
+        hsqlServer.checkRunning( true ); // throws RuntimeException if not running
+    }
+    
+    /**
+     * Executes the given script.
+     * 
+     * @param file script to execute.
+     */
+    public void exec( String file ) 
+    {
+        Connection conn = null;
+        try
+        {
+            conn = getConnection();
+            SqlFile userDbSetup = new SqlFile( new File( file ), false, null );
+            userDbSetup.execute( conn, true );
+        }
+        catch( Exception e ) 
+        {
+            LOG.error( e.getMessage(), e );
+        }
+        finally
+        {
+            close( conn ); 
+        }
+    }
+
+    /**
+     * Stops the Hypersonic server.
+     */
+    public void stop() 
+    {
+        LOG.info( "Shutting down Hypersonic JDBC server on localhost." );
+        if( hsqlServer != null ) 
+        {
+            Connection conn = null;
+            try
+            {
+                conn = getConnection();
+                conn.setAutoCommit( true );
+                conn.prepareStatement( "SHUTDOWN" ).execute();
+            }
+            catch( Exception e )
+            {
+                LOG.error( e.getMessage(), e );
+            }
+            finally
+            {
+                close( conn );
+            }
+            hsqlServer.stop();
+        }
+    }
+    
+    /**
+     * Obtains a {@link Connection}.
+     * 
+     * @return the obtained {@link Connection}.
+     * @throws IOException problems occurred loading jdbc properties file.
+     * @throws SQLException problems occurred obtaining the {@link Connection}.
+     */
+    Connection getConnection() throws IOException, SQLException
+    {
+        Connection conn;
+        Properties jProps = loadPropertiesFrom( "/jdbc.properties" );
+        conn = DriverManager.getConnection( jProps.getProperty( "jdbc.driver.url" ), 
+                                            jProps.getProperty( "jdbc.admin.id" ),
+                                            jProps.getProperty( "jdbc.admin.password" ) );
+        return conn;
+    }
+    
+    /**
+     * Closes the given {@link Connection}.
+     * 
+     * @param conn given {@link Connection}.
+     */
+    void close( Connection conn ) 
+    {
+        if( conn != null ) 
+        {
+            try
+            {
+                conn.close();
+            }
+            catch( SQLException e )
+            {
+                conn = null;
+            }
+        } 
+    }
+    
+    /**
+     * Loads a {@link Properties} object with {@code fileLocation}.
+     * 
+     * @param fileLocation properties file
+     * @return {@link Properties} holding {@code fileLocation} properties.
+     * @throws IOException if {@code fileLocation} cannot be readed.
+     */
+    Properties loadPropertiesFrom( String fileLocation ) throws IOException 
+    {
+        Properties p = new Properties();
+        InputStream inStream = this.getClass().getResourceAsStream( fileLocation );
+        p.load( inStream );
+        inStream.close();
+        return p;
+    }
+    
+    /* REFACTOR: copy of jspwiki-war/src/test/java/o.a.w.HsqlDbutil, with some minor modifications */
+    public static void main( String[] args ) {
+        HsqlDbUtils hsqldb = new HsqlDbUtils();
+        try {
+        hsqldb.start();
+        } catch (Exception e) {}
+        hsqldb.exec(args[1]);
+        if( ArrayUtils.isNotEmpty( args ) && StringUtils.equals( "tearDown", args[0] ) ) {
+    		hsqldb.tearDown();
+    	}
+    }
+    
+}

Added: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-setup.ddl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-setup.ddl?rev=1486410&view=auto
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-setup.ddl (added)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-setup.ddl Sun May 26 11:51:53 2013
@@ -0,0 +1,204 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+drop table users if exists;
+drop table roles if exists;
+drop table groups if exists;
+drop table group_members if exists;
+drop user jspwiki;
+
+create table users (
+  uid varchar(100),
+  email varchar(100),
+  full_name varchar(100),
+  login_name varchar(100) not null,
+  password varchar(100),
+  wiki_name varchar(100),
+  created timestamp,
+  modified timestamp,
+  lock_expiry timestamp,
+  attributes longvarchar,
+  constraint users primary key (uid)
+);
+
+create table roles (
+  login_name varchar(100) not null,
+  role varchar(100) not null
+);
+
+create table groups (
+  name varchar(100) not null,
+  creator varchar(100),
+  created timestamp,
+  modifier varchar(100),
+  modified timestamp,
+  constraint groups primary key (name)
+);
+
+create table group_members (
+  name varchar(100) not null,
+  member varchar(100) not null,
+  constraint group_members primary key
+    (name,member)
+);
+
+create user jspwiki password "password";
+
+grant select, insert, update, delete on users to jspwiki;
+grant select, insert, update, delete on roles to jspwiki;
+grant select, insert, update, delete on groups to jspwiki;
+grant select, insert, update, delete on group_members to jspwiki;
+
+insert into users (
+  uid,
+  email,
+  full_name,
+  login_name,
+  password,
+  wiki_name,
+  attributes
+) values (
+  '-7739839977499061014',
+  'janne@ecyrd.com',
+  'Janne Jalkanen',
+  'janne',
+  '{SSHA}1WFv9OV11pD5IySgVH3sFa2VlCyYjbLrcVT/qw==',
+  'JanneJalkanen',
+  'attribute1=some random value\nattribute2=another value'
+);
+  
+insert into users (
+  uid,
+  email,
+  full_name,
+  login_name,
+  password,
+  wiki_name
+) values (
+  '-6852820166199419346',
+  'admin@locahost',
+  'Administrator',
+  'admin',
+  '{SSHA}6YNKYMwXICUf5pMvYUZumgbFCxZMT2njtUQtJw==',
+  'Administrator'
+);
+
+insert into roles (
+  login_name,
+  role
+) values (  
+  'janne',
+  'Authenticated'
+);
+
+insert into roles (
+  login_name,
+  role
+) values (  
+  'admin',
+  'Authenticated'
+);
+
+insert into roles (
+  login_name,
+  role
+) values (  
+  'admin',
+  'Admin'
+);
+
+insert into groups (
+  name,
+  created,
+  modified
+) values (
+  'TV',
+  '2006-06-20 14:50:54.00000000',
+  '2006-06-20 14:50:54.00000000'
+);
+insert into group_members (
+  name,
+  member
+) values (  
+  'TV',
+  'Archie Bunker'
+);
+insert into group_members (
+  name,
+  member
+) values (  
+  'TV',
+  'BullwinkleMoose'
+);
+insert into group_members (
+  name,
+  member
+) values (  
+  'TV',
+  'Fred Friendly'
+);
+
+insert into groups (
+  name,
+  created,
+  modified
+) values (
+  'Literature',
+  '2006-06-20 14:50:54.00000000',
+  '2006-06-20 14:50:54.00000000'
+);
+insert into group_members (
+  name,
+  member
+) values (  
+  'Literature',
+  'Charles Dickens'
+);
+
+insert into group_members (
+  name,
+  member
+) values (  
+  'Literature',
+  'Homer'
+);
+
+insert into groups (
+  name,
+  created,
+  modified
+) values (
+  'Art',
+  '2006-06-20 14:50:54.00000000',
+  '2006-06-20 14:50:54.00000000'
+);
+
+insert into groups (
+  name,
+  created,
+  modified
+) values (
+  'Admin',
+  '2006-06-20 14:50:54.00000000',
+  '2006-06-20 14:50:54.00000000'
+);
+
+insert into group_members (
+  name,
+  member
+) values (  
+  'Admin',
+  'Administrator'
+);
+

Added: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-teardown.ddl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-teardown.ddl?rev=1486410&view=auto
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-teardown.ddl (added)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/hsql-userdb-teardown.ddl Sun May 26 11:51:53 2013
@@ -0,0 +1,19 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+drop table users if exists;
+drop table roles if exists;
+drop table groups if exists;
+drop table group_members if exists;
+drop user jspwiki;

Added: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties?rev=1486410&view=auto
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties (added)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties Sun May 26 11:51:53 2013
@@ -0,0 +1,33 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+#Ant properties
+#Used only in testing
+
+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.jar=hsqldb-1.8.0.10.jar
+jdbc.driver.url=jdbc\:hsqldb\:hsql\://localhost/jspwiki
+jdbc.user.id=jspwiki
+jdbc.user.password=password
+

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml?rev=1486410&r1=1486409&r2=1486410&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml Sun May 26 11:51:53 2013
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
-    <version>2.9.1-SNAPSHOT</version>
+    <version>2.9.2-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.jspwiki.it</groupId>
@@ -38,6 +38,7 @@
     <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>
   </modules>
   
   <profiles>
@@ -66,6 +67,50 @@
             </configuration>
           </plugin>
           
+          <plugin> <!-- exec-maven-plugin does not accept forked executions (!) -->
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>db-setUp</id>
+                <phase>pre-integration-test</phase>
+                <goals><goal>run</goal></goals>
+                <configuration>
+                  <target>
+                    <property name="compile_classpath" refid="maven.compile.classpath" />
+                    <echo message="starting hsqldb..." />
+                    <exec executable="java" dir="${env.JAVA_HOME}/bin" spawn="true">
+                        <arg value="-classpath" />
+                        <arg value="${compile_classpath}" />
+                        <arg value="org.apache.wiki.HsqlDbUtils"/>
+                        <arg value="setUp" />
+                        <arg value="${project.basedir}/target/classes/hsql-userdb-setup.ddl" />
+                    </exec>  
+                  </target>
+                </configuration>
+              </execution>
+              
+              <execution>
+                <id>db-tearDown</id>
+                <phase>post-integration-test</phase>
+                <goals><goal>run</goal></goals>
+                <configuration>
+                  <target>
+                    <property name="compile_classpath" refid="maven.compile.classpath" />
+                    <echo message="stopping hsqldb..." />
+                    <exec executable="java" dir="${env.JAVA_HOME}/bin" spawn="true">
+                        <arg value="-classpath" />
+                        <arg value="${compile_classpath}" />
+                        <arg value="org.apache.wiki.HsqlDbUtils"/>
+                        <arg value="tearDown" />
+                        <arg value="${project.basedir}/target/classes/hsql-userdb-teardown.ddl" />
+                    </exec>  
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>selenium-maven-plugin</artifactId>

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml?rev=1486410&r1=1486409&r2=1486410&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml Sun May 26 11:51:53 2013
@@ -24,7 +24,7 @@
     <parent>
       <groupId>org.apache.jspwiki</groupId>
       <artifactId>jspwiki-builder</artifactId>
-      <version>2.9.1-SNAPSHOT</version>
+      <version>2.9.2-SNAPSHOT</version>
     </parent>
   
     <modelVersion>4.0.0</modelVersion>

Modified: incubator/jspwiki/branches/MVN3_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/pom.xml?rev=1486410&r1=1486409&r2=1486410&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/pom.xml Sun May 26 11:51:53 2013
@@ -25,7 +25,7 @@
   <artifactId>jspwiki-builder</artifactId>
   <modelVersion>4.0.0</modelVersion>
   <name>Apache JSPWiki (Incubating)</name>
-  <version>2.9.1-SNAPSHOT</version>
+  <version>2.9.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich 
     and built around standard J2EE components (Java, servlets, JSP).</description>



Mime
View raw message