jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1513005 - in /jspwiki/trunk: ./ jspwiki-it-tests/ jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/ jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/ jspwiki-site/src/site/trunk/content/jspwiki/d...
Date Sun, 11 Aug 2013 21:20:52 GMT
Author: gmazza
Date: Sun Aug 11 21:20:52 2013
New Revision: 1513005

URL: http://svn.apache.org/r1513005
Log:
Getting IT tests working again after switch to jspwiki-custom.properties

Added:
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/jspwiki-custom.properties
      - copied, changed from r1512988, jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties
Removed:
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties
Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-it-tests/pom.xml
    jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
    jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
    jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
    jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties
    jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties
    jspwiki/trunk/mvn_cheat-sheet.txt

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1513005&r1=1513004&r2=1513005&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Aug 11 21:20:52 2013
@@ -1,3 +1,13 @@
+2013-08-11  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.10.0-svn-37
+
+       * Updated it-test's selenium module to use new jspwiki-custom.properties system. 
IT tests only
+         working 50% presently (same as before though).
+
+       * Removed some values from our jspwiki-custom.properties files where the defaults
in jspwiki.properties
+         are sufficient.
+        
 2013-08-09  Glen Mazza (gmazza AT apache DOT org)
 
        * 2.10.0-svn-36

Copied: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/jspwiki-custom.properties
(from r1512988, 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/classes/jspwiki-custom.properties?p2=jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/classes/jspwiki-custom.properties&p1=jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties&r1=1512988&r2=1513005&rev=1513005&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/classes/jspwiki-custom.properties
Sun Aug 11 21:20:52 2013
@@ -48,29 +48,11 @@ jspwiki.xmlGroupDatabaseFile = ${it-jspw
 jspwiki.xmlUserDatabaseFile = ${it-jspwiki.context}/target/test-classes/userdatabase.xml
 
 
-#
-# CONSTANT PROPERTY VALUES
-#
-jspwiki.pageProvider = org.apache.wiki.providers.FileSystemProvider
-
-jspwiki.usePageCache = true
-#
-#  Determines where wiki files are kept.
-#
-
 jspwiki.translatorReader.camelCaseLinks = true
-
 jspwiki.breakTitleWithSpaces = true
-
 jspwiki.translatorReader.matchEnglishPlurals = true
 jspwiki.translatorReader.useOutlinkImage = false
-
-jspwiki.attachmentProvider = BasicAttachmentProvider
-
 jspwiki.encoding = ISO-8859-1
-
-# jspwiki.filterConfig = @tests.filter@
-
 jspwiki.searchProvider = BasicSearchProvider
 
 #
@@ -87,14 +69,6 @@ jspwiki.searchProvider = BasicSearchProv
 jspwiki.specialPage.RecentChanges = RecentChanges.jsp
 jspwiki.specialPage.Search = Search.jsp
 
-# InterWiki links The %s is replaced with the page reference (specify
-# multiple times to get multiple references).  Page references should
-# appear in format : [wiki:wikipage].  
-
-jspwiki.interWikiRef.JSPWiki = http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=%s
-
-jspwiki.rss.generate = false
-
 #
 # Define which image types are inlined.
 # These are your standard glob expressions (just like in your
@@ -109,61 +83,10 @@ jspwiki.translatorReader.inlinePattern.3
 # Security: use standard providers for user/group auth, user management
 # and ACLs. Use a test userdatabase for storing users.
 #
-jspwiki.aclManager          = org.apache.wiki.auth.acl.DefaultAclManager
-#jspwiki.authorizer          = org.apache.wiki.auth.authorize.WebContainerAuthorizer
 jspwiki.admin.user = admin
 
-jspwiki.userdatabase.datasource=jdbc/UserDatabase
-jspwiki.userdatabase.table=users
-jspwiki.userdatabase.uid=uid
-jspwiki.userdatabase.email=email
-jspwiki.userdatabase.fullName=full_name
-jspwiki.userdatabase.loginName=login_name
-jspwiki.userdatabase.password=password
-jspwiki.userdatabase.wikiName=wiki_name
-jspwiki.userdatabase.created=created
-jspwiki.userdatabase.modified=modified
-jspwiki.userdatabase.lockExpiry=lock_expiry
-jspwiki.userdatabase.attributes=attributes
-jspwiki.userdatabase.roleTable=roles
-jspwiki.userdatabase.role=role
-jspwiki.groupdatabase.datasource=jdbc/GroupDatabase
-jspwiki.groupdatabase.table=groups
-jspwiki.groupdatabase.membertable=group_members
-jspwiki.groupdatabase.created=created
-jspwiki.groupdatabase.creator=creator
-jspwiki.groupdatabase.name=name
-jspwiki.groupdatabase.member=member
-jspwiki.groupdatabase.modified=modified
-jspwiki.groupdatabase.modifier=modifier
-
-#
-#  Configure logs.
-#
-#  Send mail on alerts
-#
-#
-#  Log only interesting stuff on screen.
-#
-#log4j.appender.console = org.apache.log4j.ConsoleAppender
-#log4j.appender.console.Threshold = WARN
- 
-#log4j.appender.console.layout = org.apache.log4j.PatternLayout
-#log4j.appender.console.layout.ConversionPattern = %-5p: %m%n
-
-#
-#  Log everything into a file.
-log4j.rootCategory=INFO,FileLog
-# log4j.logger.org.apache.wiki=INFO, FileLog
-log4j.logger.org.mortbay=INFO, TestContainerLog
 log4j.logger.SecurityLog=INFO, SecurityAppender
 
-log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
-log4j.appender.FileLog.MaxFileSize    = 10MB
-log4j.appender.FileLog.MaxBackupIndex = 14
-log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
-log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
-
 log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
 log4j.appender.SecurityAppender.MaxFileSize    = 10MB
 log4j.appender.SecurityAppender.MaxBackupIndex = 14
@@ -181,8 +104,6 @@ log4j.appender.TestContainerLog.layout.C
 mail.smtp.host = 127.0.0.1
 mail.smtp.port = 25
 mail.from = JSPWiki <JSPWiki@localhost>
-#mail.smtp.account = 
-#mail.smtp.password = 
 
 # Workflow test properties
 jspwiki.approver.workflow.saveWikiPage=

Modified: jspwiki/trunk/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/pom.xml?rev=1513005&r1=1513004&r2=1513005&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/pom.xml Sun Aug 11 21:20:52 2013
@@ -34,7 +34,7 @@
   <packaging>pom</packaging>
   
   <modules>
-    <module>jspwiki-selenium-tests</module> <!-- not really necessary; just
in case if some day we need to reference the artifact... -->
+    <!--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>

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=1513005&r1=1513004&r2=1513005&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
Sun Aug 11 21:20:52 2013
@@ -1,6 +1,29 @@
 Title: Changelog
 
-#### 2013-08-07  Glen Mazza (gmazza AT apache DOT org)
+#### 2013-08-11  Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-37
+
+* Updated it-test's selenium module to use new jspwiki-custom.properties system.  IT tests
only
+  working 50% (same as before though).
+
+* Removed some values from our jspwiki-custom.properties files where the defaults in jspwiki.properties
+  are sufficient.
+ 
+#### 2013-08-09  Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-36
+
+* Introducted new jspwiki-custom.properties file, which can be placed in test/resources for
JUnit tests
+  or externally to the WAR (for Tomcat, $CATALINA_HOME/lib) and will be picked up automatically
by 
+  JSPWiki.  Only those elements that you're changing from default src/main/resources/ini/jspwiki.properties
+  need addition to the custom properties file.  I still need to convert the Selenium tests
to the new format.
+
+* Renamed jspwiki.properties, _rcs.properties, and _vers.properties file with new -custom
suffix in src/test/resources
+  (can be named anything as JUnit tests hardcode the names).  Removed elements that are the
same as those
+  in the default jspwiki.properties file.
+ 
+#### 2013-08-08  Glen Mazza (gmazza AT apache DOT org)
 
 * 2.10.0-svn-35
 
@@ -8,7 +31,7 @@ Title: Changelog
  
 #### 2013-08-07  Glen Mazza (gmazza AT apache DOT org)
 
-* 2.10.0-svn-34
+* 2.10.0-svn-34find 
 
 * Upgrade from Jetty used in unit test cases from v. 7.6.7 to v. 9.0.4
  

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=1513005&r1=1513004&r2=1513005&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Sun Aug 11 21:20:52
2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-35
\ No newline at end of file
+JSPWiki v2.10.0-svn-37
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1513005&r1=1513004&r2=1513005&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 Sun Aug 11 21:20:52
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         = "36";
+    public static final String     BUILD         = "37";
     
     /**
      *  This is the generic version string you should use

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties?rev=1513005&r1=1513004&r2=1513005&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties Sun Aug 11 21:20:52
2013
@@ -640,7 +640,7 @@ jspwiki.aclManager = org.apache.wiki.aut
 #
 # This is the JSPWiki home.  In future, JSPWiki will probably rely on this
 # for error messages, so I don't recommend that you change it.
-jspwiki.interWikiRef.JSPWiki = http://www.jspwiki.org/wiki/%s
+jspwiki.interWikiRef.JSPWiki = http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=%s
 
 # Here's how you can have directly links to the JSPWiki editor.
 # Now you can put a hyperlink for editing "MainPage" by making

Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties?rev=1513005&r1=1513004&r2=1513005&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties Sun Aug 11 21:20:52
2013
@@ -40,12 +40,6 @@ jspwiki.authorizer=org.apache.wiki.TestA
 jspwiki.specialPage.RecentChanges = RecentChanges.jsp
 jspwiki.specialPage.Search = Search.jsp
 
-# InterWiki links The %s is replaced with the page reference (specify
-# multiple times to get multiple references).  Page references should
-# appear in format : [wiki:wikipage].  
-
-jspwiki.interWikiRef.JSPWiki = http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=%s
-
 #
 # Define which image types are inlined.
 # These are your standard glob expressions (just like in your

Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties?rev=1513005&r1=1513004&r2=1513005&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties Sun Aug 11
21:20:52 2013
@@ -29,7 +29,6 @@ jspwiki.workDir = @tests.workdir@
 jspwiki.searchProvider = BasicSearchProvider
 jspwiki.specialPage.RecentChanges = RecentChanges.jsp
 jspwiki.specialPage.Search = Search.jsp
-jspwiki.interWikiRef.JSPWiki = http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=%s
 
 #
 # Define which image types are inlined.

Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties?rev=1513005&r1=1513004&r2=1513005&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties Sun Aug 11
21:20:52 2013
@@ -33,12 +33,6 @@ jspwiki.searchProvider = BasicSearchProv
 jspwiki.specialPage.RecentChanges = RecentChanges.jsp
 jspwiki.specialPage.Search = Search.jsp
 
-# InterWiki links The %s is replaced with the page reference (specify
-# multiple times to get multiple references).  Page references should
-# appear in format : [wiki:wikipage].  
-
-jspwiki.interWikiRef.JSPWiki = http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=%s
-
 #
 # Define which image types are inlined.
 # These are your standard glob expressions (just like in your

Modified: jspwiki/trunk/mvn_cheat-sheet.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/mvn_cheat-sheet.txt?rev=1513005&r1=1513004&r2=1513005&view=diff
==============================================================================
--- jspwiki/trunk/mvn_cheat-sheet.txt (original)
+++ jspwiki/trunk/mvn_cheat-sheet.txt Sun Aug 11 21:20:52 2013
@@ -19,7 +19,7 @@ mvn clean deploy -Papache-release -Dgpg.
                                                                   If -Dgpg.passphrase is
not given, expects a gpg-agent
                                                                   running
 mvn clean install -Pintegration-tests                           : performs a build, enabling
Selenium tests execution
-
+                                                                  (best run from the jspwiki-it-tests
folder).
 mvn wro4j:run -Dminimize=true                                   : merge & compress js
& css files
 mvn wro4j:run -Dminimize=false                                  : only merge the js &
css files  (no compression)
 mvn clean install -Dmaven.test.skip -Dminimize=false            : performs a build, skipping
the tests and skip compression
@@ -35,9 +35,10 @@ mvn cobertura:cobertura : generates a co
 mvn javadoc:javadoc     : creates javadocs; if graphviz binaries (www.graphviz.org)
                           are found on $PATH, the javadocs will display some UML
                           class/package level diagrams
-mvn sonar:sonar         : generates a Sonar report. Expects a Sonar server running at http://localhost:9000/
See:
+mvn sonar:sonar         : generates a Sonar report. Expects a Sonar server running at http://localhost:9000/,
from
+                          where you can see results afterwards (note default username/password
login is admin/admin).
+                          See:
                             http://mojo.codehaus.org/sonar-maven-plugin/plugin-info.html
                             http://docs.codehaus.org/display/SONAR/Get+started+in+2+minutes
 cd jspwiki-site; mvn test -Dtest=SiteGeneratorTest: Checks all language resource files for
missing or
                           unused translations.
-



Mime
View raw message