jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1484599 - in /incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests: ./ jspwiki-it-test-custom-absolute-urls/ jspwiki-it-test-custom-absolute-urls/src/ jspwiki-it-test-custom-absolute-urls/src/main/ jspwiki-it-test-custom-absolute-urls/s...
Date Mon, 20 May 2013 21:21:47 GMT
Author: juanpablo
Date: Mon May 20 21:21:47 2013
New Revision: 1484599

URL: http://svn.apache.org/r1484599
Log:
JSPWIKI-770:                                                            
- added custom auth, absolute URLs module for selenium execution
- moved common selenium execution configuration to custom profile, integration tests are launched
only if -Pintegration-tests is given

Added:
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/
    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-absolute-urls/src/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
Modified:
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml

Added: 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=1484599&view=auto
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
(added)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
Mon May 20 21:21:47 2013
@@ -0,0 +1,69 @@
+<?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.1-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>org.apache.incubator.jspwiki.it</groupId>
+  <artifactId>jspwiki-it-test-custom-absolute-urls</artifactId>
+  <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
-->
+               <!-- 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>
+  </properties>
+  
+  <build>
+    <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>
+      
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file

Added: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/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-absolute-urls/src/main/webapp/WEB-INF/web.xml?rev=1484599&view=auto
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
(added)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
Mon May 20 21:21:47 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=1484599&r1=1484598&r2=1484599&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
Mon May 20 21:21:47 2013
@@ -21,7 +21,7 @@
          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>
+  <parent> <!-- this enables tests reuse [1/3] -->
     <groupId>org.apache.jspwiki.it</groupId>
     <artifactId>jspwiki-it-builder</artifactId>
     <version>2.9.1-SNAPSHOT</version>
@@ -31,12 +31,12 @@
   <artifactId>jspwiki-it-test-custom</artifactId>
   <modelVersion>4.0.0</modelVersion>
   <name>jspwiki-it-test-custom</name>
-  <description>selenium tests execution for jspwiki-test-custom (custom auth, relative
URLs)</description>
+  <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 [1/4] -->
+  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
   
   <properties> <!-- values injected at jspwiki.properties & selenium templates
-->
-               <!-- this enables tests reuse [2/4] -->
+               <!-- 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>
@@ -50,100 +50,20 @@
   
   <build>
     <finalName>${project.artifactId}</finalName>
-    <testResources><!-- this enables tests reuse [3/4] -->
-      <testResource>
-        <directory>${project.basedir}/../jspwiki-selenium-tests/src/test/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
-    
-    <plugins>
-      <plugin><!-- this enables tests reuse [4/4] -->
+    <plugins> <!-- selenium test execution -->
+      <plugin>
         <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <webResources>
-            <resource>
-              <directory>../jspwiki-selenium-tests/src/main/resources</directory>
-              <filtering>true</filtering>
-            </resource>
-          </webResources>
-        </configuration>
       </plugin>
       
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>selenium-maven-plugin</artifactId>
-        <configuration>
-          <browser>*firefox</browser>
-          <!-- <browser>*iexplore</browser> -->
-          <startURL>http://localhost:8080/${project.artifactId}/</startURL>
-          <suite>target/test-classes/selenium/TestSuite.html</suite> 
-          <background>true</background>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>selenese</goal>
-            </goals>
-          </execution>                               
-        </executions>
       </plugin>
       
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>tomcat-run</id>
-            <goals>
-              <goal>run-war</goal>
-            </goals>
-            <phase>pre-integration-test</phase>
-            <configuration>
-              <fork>true</fork>
-              <systemProperties>
-                <user.language>en</user.language>
-              </systemProperties>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tomcat-shutdown</id>
-            <goals>
-              <goal>shutdown</goal>
-            </goals>
-            <phase>post-integration-test</phase>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.jspwiki</groupId>
-      <artifactId>jspwiki-war</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>
-                
-    <dependency>
-      <groupId>org.seleniumhq.selenium.client-drivers</groupId>
-      <artifactId>selenium-java-client-driver</artifactId>
-    </dependency>
- 
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-java</artifactId>
-    </dependency>
- 
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <!-- (un)comment based on your browser preferences for tests execution -->
-      <!-- <artifactId>selenium-chrome-driver</artifactId> -->
-      <!-- <artifactId>selenium-ie-driver</artifactId> -->
-      <artifactId>selenium-firefox-driver</artifactId>
-    </dependency>
-  </dependencies>
 </project>
\ No newline at end of file

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=1484599&r1=1484598&r2=1484599&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml Mon May 20 21:21:47 2013
@@ -37,6 +37,114 @@
   <modules>
     <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>
   </modules>
   
+  <profiles>
+    <profile>
+      <id>integration-tests</id>
+      <build>
+        <finalName>${project.artifactId}</finalName>
+        <testResources><!-- this enables tests reuse [1/2] -->
+          <testResource>
+            <directory>${project.basedir}/../jspwiki-selenium-tests/src/test/resources</directory>
+            <filtering>true</filtering>
+          </testResource>
+        </testResources>
+        
+        <pluginManagement>
+        <plugins>
+          <plugin><!-- this enables tests reuse [2/2] -->
+            <artifactId>maven-war-plugin</artifactId>
+            <configuration>
+              <webResources>
+                <resource>
+                  <directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </webResources>
+            </configuration>
+          </plugin>
+          
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>selenium-maven-plugin</artifactId>
+            <configuration>
+              <!-- <browser>*firefox</browser> -->
+              <browser>*iexplore</browser>
+              <startURL>http://localhost:8080/${project.artifactId}/</startURL>
+              <suite>target/test-classes/selenium/TestSuite.html</suite> 
+              <background>true</background>
+            </configuration>
+            <executions>
+              <execution>
+                <id>test</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>selenese</goal>
+                </goals>
+              </execution>                               
+            </executions>
+          </plugin>
+          
+          <plugin>
+            <groupId>org.apache.tomcat.maven</groupId>
+            <artifactId>tomcat7-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>tomcat-run</id>
+                <goals>
+                  <goal>run-war</goal>
+                </goals>
+                <phase>pre-integration-test</phase>
+                <configuration>
+                  <fork>true</fork>
+                  <systemProperties>
+                    <user.language>en</user.language>
+                    <user.region>US</user.region>
+                  </systemProperties>
+                </configuration>
+              </execution>
+              <execution>
+                <id>tomcat-shutdown</id>
+                <goals>
+                  <goal>shutdown</goal>
+                </goals>
+                <phase>post-integration-test</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+        </pluginManagement>
+      </build>
+      
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.jspwiki</groupId>
+          <artifactId>jspwiki-war</artifactId>
+          <version>${project.version}</version>
+          <type>war</type>
+        </dependency>
+                    
+        <dependency>
+          <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+          <artifactId>selenium-java-client-driver</artifactId>
+        </dependency>
+      
+        <dependency>
+          <groupId>org.seleniumhq.selenium</groupId>
+          <artifactId>selenium-java</artifactId>
+        </dependency>
+      
+        <dependency>
+          <groupId>org.seleniumhq.selenium</groupId>
+          <!-- (un)comment based on your browser preferences for tests execution -->
+          <!-- <artifactId>selenium-chrome-driver</artifactId> -->
+          <artifactId>selenium-ie-driver</artifactId>
+          <!-- <artifactId>selenium-firefox-driver</artifactId> -->
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+  
 </project>
\ No newline at end of file



Mime
View raw message