You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/07/31 23:06:07 UTC
svn commit: r1509033 - in /jspwiki/trunk: ./ jspwiki-it-tests/ jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/ jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/ jspwiki-site/src/site/trunk/content/jspwiki/development/ jspw...

Author: gmazza
Date: Wed Jul 31 21:06:07 2013
New Revision: 1509033

URL: http://svn.apache.org/r1509033
Log:
Added missing Lucene test dependency, rearranging the user/group database files in Selenium to improve test results.

Added:
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/groupdatabase.xml
      - copied unchanged from r1508953, jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/groupdatabase.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/userdatabase.xml
      - copied unchanged from r1508953, jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/userdatabase.xml
Removed:
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/groupdatabase.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/userdatabase.xml
Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties
    jspwiki/trunk/jspwiki-it-tests/pom.xml
    jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
    jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
    jspwiki/trunk/jspwiki-war/pom.xml
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/pom.xml

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1509033&r1=1509032&r2=1509033&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Wed Jul 31 21:06:07 2013
@@ -1,9 +1,16 @@
-2013-07-28  Glen Mazza (gmazza AT apache DOT org)
+2013-07-31  Glen Mazza (gmazza AT apache DOT org)
 
-       * 2.10.0-svn-24
+       * 2.10.0-svn-25
 
-       * JSPWIKI-791: Upgrade Lucene from 3.6.0 to 4.4.0
+       * Added missing Lucene dependency for testing, changed location of
+         userdatabase.xml and groupdatabase.xml to get more of the Selenium
+         tests running.
          
+2013-07-30  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.10.0-svn-24
+
+       * JSPWIKI-791: Upgrade Lucene from 3.6.0 to 4.4.0       
 
 2013-07-28  Harry Metske (metskem@apache.org)
 

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties?rev=1509033&r1=1509032&r2=1509033&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties Wed Jul 31 21:06:07 2013
@@ -44,6 +44,10 @@ log4j.appender.FileLog.File             
 log4j.appender.TestContainerLog.File       = ./${project.artifactId}/target/test-classes/container-${project.artifactId}.log
 log4j.appender.SecurityAppender.File       = ./${project.artifactId}/target/test-classes/security-${project.artifactId}.log
 
+jspwiki.xmlGroupDatabaseFile = ${it-jspwiki.context}/target/test-classes/groupdatabase.xml
+jspwiki.xmlUserDatabaseFile = ${it-jspwiki.context}/target/test-classes/userdatabase.xml
+
+
 #
 # CONSTANT PROPERTY VALUES
 #
@@ -107,8 +111,6 @@ jspwiki.translatorReader.inlinePattern.3
 #
 jspwiki.aclManager          = org.apache.wiki.auth.acl.DefaultAclManager
 #jspwiki.authorizer          = org.apache.wiki.auth.authorize.WebContainerAuthorizer
-jspwiki.xmlGroupDatabaseFile = target/test-classes/groupdatabase.xml
-jspwiki.xmlUserDatabaseFile = target/test-classes/userdatabase.xml
 jspwiki.admin.user = admin
 
 jspwiki.userdatabase.datasource=jdbc/UserDatabase
@@ -185,4 +187,4 @@ mail.from = JSPWiki <JS...@localhost>
 # Workflow test properties
 jspwiki.approver.workflow.saveWikiPage=
 jspwiki.approver.workflow.foo=janne
-jspwiki.approver.workflow.bar=Admin
\ No newline at end of file
+jspwiki.approver.workflow.bar=Admin

Modified: jspwiki/trunk/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/pom.xml?rev=1509033&r1=1509032&r2=1509033&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/pom.xml Wed Jul 31 21:06:07 2013
@@ -189,4 +189,4 @@
       </dependencies>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1509033&r1=1509032&r2=1509033&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Wed Jul 31 21:06:07 2013
@@ -1,5 +1,12 @@
 Title: Changelog
 
+#### 2013-07-28  Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-24
+
+* [JSPWIKI 791][JIRA-791]: Upgrade Lucene from 3.6.0 to 4.4.0
+  
+
 #### 2013-07-28  Harry Metske (metskem@apache.org)
 
 * 2.10.0-svn-23
@@ -1028,6 +1035,7 @@ and propagated the change to all plugins
 * 2.9.0-svn-1
 
 * release bump because of package rename
+  [JIRA-791]: https://issues.apache.org/jira/browse/JSPWIKI-791
   [JIRA-784]: https://issues.apache.org/jira/browse/JSPWIKI-784
   [JIRA-772]: https://issues.apache.org/jira/browse/JSPWIKI-772
   [JIRA-303]: https://issues.apache.org/jira/browse/JSPWIKI-303

Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1509033&r1=1509032&r2=1509033&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Wed Jul 31 21:06:07 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-23
\ No newline at end of file
+JSPWiki v2.10.0-svn-24
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1509033&r1=1509032&r2=1509033&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Wed Jul 31 21:06:07 2013
@@ -49,6 +49,12 @@
     </dependency>
     
     <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <scope>provided</scope>

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1509033&r1=1509032&r2=1509033&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Wed Jul 31 21:06:07 2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "24";
+    public static final String     BUILD         = "25";
     
     /**
      *  This is the generic version string you should use

Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1509033&r1=1509032&r2=1509033&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Wed Jul 31 21:06:07 2013
@@ -157,6 +157,13 @@
       </dependency>
 
       <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-analyzers-common</artifactId>
+        <scope>compile</scope>
+        <version>${lucene.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.freshcookies</groupId>
         <artifactId>freshcookies-security</artifactId>
         <version>0.60</version>