jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1517214 - in /jspwiki/trunk: ./ jspwiki-it-tests/ jspwiki-it-tests/jspwiki-it-test-cma-jdbc/ jspwiki-it-tests/jspwiki-it-test-cma/ jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/ jspwiki-it-tests/jspwiki-it-test-container-jdb...
Date Sat, 24 Aug 2013 23:22:40 GMT
Author: gmazza
Date: Sat Aug 24 23:22:39 2013
New Revision: 1517214

URL: http://svn.apache.org/r1517214
Log:
Fixed jspwiki-it-test-container-jdbc test, all five IT tests now working.

Added:
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/
      - copied from r1517201, jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container/
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/
      - copied from r1517201, jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/
Removed:
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container/
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/
Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
    jspwiki/trunk/jspwiki-it-tests/pom.xml

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1517214&r1=1517213&r2=1517214&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sat Aug 24 23:22:39 2013
@@ -1,3 +1,12 @@
+2013-08-24  Glen Mazza (gmazza AT apache DOT org)
+
+       * No revision number (IT tests change only)
+
+       * jspwiki-it-test-container-jdbc test now working, so all five IT test submodules
are working 
+         (except for RenameProfile which fails with all tests).
+
+       * renamed the two "container" tests to more descriptive "cma" (container-managed authentication).
+        
 2013-08-22  Glen Mazza (gmazza AT apache DOT org)
 
        * No revision number (IT tests change only)

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml?rev=1517214&r1=1517201&r2=1517214&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml Sat Aug 24 23:22:39 2013
@@ -26,8 +26,9 @@
     <artifactId>jspwiki-it-builder</artifactId>
     <version>2.10.0-SNAPSHOT</version>
   </parent>
-  
-  <artifactId>jspwiki-it-test-container-jdbc</artifactId>
+
+  <!-- Container Managed Authentication using JDBC instead of XML files for user and group
info -->
+  <artifactId>jspwiki-it-test-cma-jdbc</artifactId>
   <modelVersion>4.0.0</modelVersion>
   <description>selenium tests execution for jspwiki-it-test-container-jdbc (container
auth, relative URLs, JDBC database)</description>
   <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
@@ -44,16 +45,8 @@
   <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>
         <filtering>true</filtering>
       </resource>
@@ -69,6 +62,11 @@
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>
         <configuration>
+          <!-- Using CMA, so Tomcat instance needs a tomcat-users.xml w/usernames &
passwords -->
+          <tomcatUsers>
+            ${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat-users.xml
+          </tomcatUsers>
+          <!-- Using JDBC for User & Group info, so Tomcat instance needs JNDI lookups
for database -->
           <contextFile>${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat7-context.xml</contextFile>
         </configuration>
       </plugin>

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml?rev=1517214&r1=1517201&r2=1517214&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml Sat Aug 24 23:22:39 2013
@@ -27,7 +27,8 @@
     <version>2.10.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>jspwiki-it-test-container</artifactId>
+  <!-- Container Managed Authentication -->
+  <artifactId>jspwiki-it-test-cma</artifactId>
   <modelVersion>4.0.0</modelVersion>
   <description>selenium tests execution for jspwiki-it-test-container (container auth,
relative URLs)</description>
   <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
@@ -43,17 +44,21 @@
   
   <build>
     <finalName>${project.artifactId}</finalName>
-    <plugins> <!-- selenium test execution -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-      </plugin>
-      
+    <plugins>
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>
+        <configuration>
+          <!-- Using CMA, so Tomcat instance needs a tomcat-users.xml w/usernames &
passwords -->
+          <tomcatUsers>
+            ${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat-users.xml
+          </tomcatUsers>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
       </plugin>
-
     </plugins>
   </build>
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml?rev=1517214&r1=1517201&r2=1517214&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml Sat
Aug 24 23:22:39 2013
@@ -166,35 +166,6 @@
        <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>
@@ -222,52 +193,12 @@
      <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,
+       constraints 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
@@ -303,8 +234,6 @@
        elements.
    -->
 
-   
-   
    <security-constraint>
        <web-resource-collection>
            <web-resource-name>Administrative Area</web-resource-name>
@@ -373,7 +302,5 @@
        </description>
        <role-name>Admin</role-name>
    </security-role>
-   
-   
- 
+
 </web-app>

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=1517214&r1=1517213&r2=1517214&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 Sat Aug 24
23:22:39 2013
@@ -43,16 +43,15 @@
   
   <build>
     <finalName>${project.artifactId}</finalName>
-    <plugins> <!-- selenium test execution -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-      </plugin>
-      
+    <plugins>
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file

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=1517214&r1=1517213&r2=1517214&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 Sat Aug 24 23:22:39
2013
@@ -44,28 +44,7 @@
   <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>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    
     <plugins>
-
-      <!-- selenium test execution -->
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-      </plugin>
-
         <plugin>
             <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
             <artifactId>inmemdb-maven-plugin</artifactId>
@@ -75,7 +54,8 @@
             <groupId>org.apache.tomcat.maven</groupId>
             <artifactId>tomcat7-maven-plugin</artifactId>
             <configuration>
-                <contextFile>${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat7-context.xml</contextFile>
+              <!-- Using JDBC for User & Group info, so Tomcat instance needs JNDI
lookups for database -->
+              <contextFile>${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat7-context.xml</contextFile>
             </configuration>
         </plugin>
 
@@ -83,7 +63,6 @@
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>selenium-maven-plugin</artifactId>
         </plugin>
-
     </plugins>
   </build>
 

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=1517214&r1=1517213&r2=1517214&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 Sat Aug 24 23:22:39 2013
@@ -44,16 +44,15 @@
   
   <build>
     <finalName>${project.artifactId}</finalName>
-    <plugins> <!-- selenium test execution -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-      </plugin>
-      
+    <plugins>
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1517214&r1=1517213&r2=1517214&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Sat Aug 24 23:22:39 2013
@@ -40,27 +40,5 @@
       <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>
-
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>sqltool</artifactId>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/pom.xml?rev=1517214&r1=1517213&r2=1517214&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/pom.xml Sat Aug 24 23:22:39 2013
@@ -35,11 +35,11 @@
   
   <modules>
     <module>jspwiki-selenium-tests</module>
-    <!--module>jspwiki-it-test-custom</module-->
-    <!--module>jspwiki-it-test-custom-absolute-urls</module>
-    <module>jspwiki-it-test-container</module-->
-    <!--module>jspwiki-it-test-container-jdbc</module-->
+    <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-cma</module>
+    <module>jspwiki-it-test-cma-jdbc</module>
   </modules>
   
   <profiles>
@@ -130,6 +130,8 @@
             </executions>
           </plugin>
           
+          <!-- Additional Tomcat configuration (JNDI lookups for DB access, tomcat-users.xml
file)
+               located in pom.xml of submodules using them. -->
           <plugin>
             <groupId>org.apache.tomcat.maven</groupId>
             <artifactId>tomcat7-maven-plugin</artifactId>
@@ -142,9 +144,6 @@
                 </goals>
                 <phase>pre-integration-test</phase>
                 <configuration>
-                  <additionalConfigFilesDir>
-                    jspwiki-selenium-tests/src/main/config/tomcatconf
-                  </additionalConfigFilesDir>
                   <fork>true</fork>
                   <systemProperties>
                     <user.language>en</user.language>



Mime
View raw message