[Jamwiki-commit] SF.net SVN: jamwiki: [1599] wiki/trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1599
          http://svn.sourceforge.net/jamwiki/?rev=1599&view=rev
Author:   mikegremi
Date:     2007-07-24 03:42:27 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
Merged revisions 1556-1598 via svnmerge from 
https://jamwiki.svn.sourceforge.net/svnroot/jamwiki/wiki/branches/mikegremi

................
  r1584 | mikegremi | 2007-07-23 14:05:54 +0200 (Mon, 23 Jul 2007) | 1 line

  Add TiddlyWiki Import
................
  r1597 | mikegremi | 2007-07-24 09:58:05 +0200 (Tue, 24 Jul 2007) | 1 line

  update revision number of already merged in trunk
................
  r1598 | mikegremi | 2007-07-24 10:05:28 +0200 (Tue, 24 Jul 2007) | 210 lines

  Merged revisions 1557-1597 via svnmerge from 
  https://jamwiki.svn.sourceforge.net/svnroot/jamwiki/wiki/trunk

  ........
    r1557 | wrh2 | 2007-07-21 08:28:38 +0200 (Sat, 21 Jul 2007) | 5 lines

    Authentication & Authorization:
      * During an upgrade first create the tables, then add roles, then
        groups and default group roles.
      * This was previously committed as revision 1549, but the commit was
        lost in recent merges.
  ........
    r1558 | wrh2 | 2007-07-21 08:34:41 +0200 (Sat, 21 Jul 2007) | 8 lines

    Error handling:
      * Catch Throwable rather than Exception to deal with cases where
        an Error object is thrown.
      * Add logging with a suggested fix for cases where image resizing
        fails.
      * This was previously committed as revision 1550, but the commit was
        lost in recent merges.
  ........
    r1559 | wrh2 | 2007-07-21 08:39:58 +0200 (Sat, 21 Jul 2007) | 6 lines

    Look & Feel:
      * Set class 'image' instead of 'imgright', if there's no alignment
        in the Image tag defined.
      * This was previously committed by axelcl as revision 1553, but
        the commit was lost in recent merges.
  ........
    r1560 | wrh2 | 2007-07-21 08:42:54 +0200 (Sat, 21 Jul 2007) | 4 lines

    Error Handling:
      * Add CHANGELOG entry for recent bug, including Michael Osipov as
        the individual responsible for reporting and assisting in finding
        a fix.
  ........
    r1561 | mikegremi | 2007-07-21 14:48:52 +0200 (Sat, 21 Jul 2007) | 1 line

    Add maven parent information in jamwiki/pom.xml
  ........
    r1562 | wrh2 | 2007-07-21 20:08:56 +0200 (Sat, 21 Jul 2007) | 2 lines

    Maven:
      * JAMWiki supports servlet 2.3, not 2.4.
  ........
    r1563 | mikegremi | 2007-07-22 03:30:28 +0200 (Sun, 22 Jul 2007) | 1 line

    Moved repository to /jamwiki. Didn't work otherwise
  ........
    r1564 | wrh2 | 2007-07-22 04:55:07 +0200 (Sun, 22 Jul 2007) | 2 lines

    Maven:
      * Add Maven-generated directories to the ignore list.
  ........
    r1565 | decamps | 2007-07-22 13:48:38 +0200 (Sun, 22 Jul 2007) | 3 lines

    Adopting flat layout, as IDE management of jamwiki-parent is easier
  ........
    r1566 | wrh2 | 2007-07-22 17:20:06 +0200 (Sun, 22 Jul 2007) | 6 lines

    Maven:
      * Update the README.txt file with new build info, and remove repository
        layout info (better maintained on the wiki).
      * Delete the now-unused ANT scripts.
      * Delete the mavenize.xml script, which simply moved files into
        Maven-compatible locations (already done in the repository).
  ........
    r1567 | decamps | 2007-07-22 17:42:09 +0200 (Sun, 22 Jul 2007) | 1 line

    remove <scope>compile</scope> in dependencies as it is the default value
  ........
    r1568 | decamps | 2007-07-22 17:50:22 +0200 (Sun, 22 Jul 2007) | 3 lines

    fix agregator
    TODO split agregator and parent
  ........
    r1569 | decamps | 2007-07-22 18:00:02 +0200 (Sun, 22 Jul 2007) | 1 line

    modified parent
  ........
    r1570 | decamps | 2007-07-22 18:00:37 +0200 (Sun, 22 Jul 2007) | 1 line

    some modifications ongoing in the parent
  ........
    r1571 | decamps | 2007-07-22 20:05:19 +0200 (Sun, 22 Jul 2007) | 2 lines

    Adding extension to filename because a popular OS uses this to detect the file type and decide which application is associated with.
  ........
    r1572 | decamps | 2007-07-22 20:06:13 +0200 (Sun, 22 Jul 2007) | 2 lines

    Symlinks to text files (README, CREDITS, etc.)
  ........
    r1573 | wrh2 | 2007-07-22 20:08:27 +0200 (Sun, 22 Jul 2007) | 7 lines

    Authentication & Authorization:
      * Get rid of wiki_user_info.is_admin, instead use the Acegi ROLE_ADMIN.
      * Modify the upgrade code to convert existing admins to the new
        format.
      * Modify the setup code to properly setup the admin user.
      * See the UPGRADE.txt document for required database changes if you
        are already running 0.6.0.
  ........
    r1574 | decamps | 2007-07-22 20:25:00 +0200 (Sun, 22 Jul 2007) | 1 line

    full list of developers
  ........
    r1575 | wrh2 | 2007-07-22 20:36:43 +0200 (Sun, 22 Jul 2007) | 3 lines

    Documentation:
      * Add Mike & R?\195?\169gis to CREDITS.txt.
      * Update timezone in pom.xml.
  ........
    r1576 | decamps | 2007-07-22 21:12:07 +0200 (Sun, 22 Jul 2007) | 1 line

    update comment to real situation
  ........
    r1577 | decamps | 2007-07-22 21:55:03 +0200 (Sun, 22 Jul 2007) | 1 line

    FIXME test fails because of i18n
  ........
    r1578 | wrh2 | 2007-07-22 23:28:22 +0200 (Sun, 22 Jul 2007) | 2 lines

    Authentication & Authorization:
      * Get rid of WikiUser.getAdmin(), replace with WikiUser.hasRole().
  ........
    r1579 | decamps | 2007-07-22 23:46:53 +0200 (Sun, 22 Jul 2007) | 3 lines

    removed bogus tests
    add real test for convert encoding
  ........
    r1580 | wrh2 | 2007-07-23 01:30:18 +0200 (Mon, 23 Jul 2007) | 2 lines

    Authentication & Authorization:
      * Replace PROP_TOPIC_NON_ADMIN_TOPIC_MOVE with ROLE_MOVE.
  ........
    r1581 | wrh2 | 2007-07-23 03:21:26 +0200 (Mon, 23 Jul 2007) | 5 lines

    Authentication & Authorization:
      * By default assign ROLE_USER to all WikiUsers.  This resolves problems
        with "remember me" cookies during upgrades.
      * Successful upgrade may now require user to re-login.  That will be
        addressed in a future commit.
  ........
    r1582 | wrh2 | 2007-07-23 04:54:00 +0200 (Mon, 23 Jul 2007) | 4 lines

    Authentication & Authorization:
      * Get rid of Utilities.login().
      * Clear the security context after setup/upgrade to ensure that the
        user doesn't have incomplete credentials.
  ........
    r1583 | wrh2 | 2007-07-23 05:00:51 +0200 (Mon, 23 Jul 2007) | 2 lines

    Cleanup:
      * Get rid of unused imports identified by PMD.
  ........
    r1585 | mikegremi | 2007-07-23 14:51:57 +0200 (Mon, 23 Jul 2007) | 1 line

    declare exception
  ........
    r1586 | decamps | 2007-07-23 20:00:40 +0200 (Mon, 23 Jul 2007) | 1 line

    remmove junk code (unused, and similar to Utilities.readFile() anyway)
  ........
    r1587 | decamps | 2007-07-23 21:16:46 +0200 (Mon, 23 Jul 2007) | 1 line

    cleaning of empty unit tests, and some simple implementations
  ........
    r1588 | decamps | 2007-07-23 21:23:00 +0200 (Mon, 23 Jul 2007) | 1 line

    unit test for Parser. Sorry, 2 bugs risen
  ........
    r1589 | decamps | 2007-07-23 22:28:41 +0200 (Mon, 23 Jul 2007) | 2 lines

    Externalize PMD conf in pmd.xml
  ........
    r1590 | decamps | 2007-07-23 22:48:57 +0200 (Mon, 23 Jul 2007) | 2 lines

    WARNING - hazardous commit:
    Removed transitive dependencies.
  ........
    r1591 | decamps | 2007-07-23 23:22:06 +0200 (Mon, 23 Jul 2007) | 1 line

    Comment blocking bugs. The code needs to be fixed.
  ........
    r1592 | decamps | 2007-07-23 23:22:57 +0200 (Mon, 23 Jul 2007) | 1 line

    classes generated by jflex are produced in target/generated-sources
  ........
    r1593 | decamps | 2007-07-24 00:01:41 +0200 (Tue, 24 Jul 2007) | 2 lines

    fix phase for jflex source generation
  ........
    r1594 | decamps | 2007-07-24 01:36:26 +0200 (Tue, 24 Jul 2007) | 1 line

    factorise CheckboxTag and RadioTag in AbstractButtonClass
  ........
    r1595 | decamps | 2007-07-24 01:36:55 +0200 (Tue, 24 Jul 2007) | 1 line

    factorise CheckboxTag and RadioTag in AbstractButtonClass
  ........
    r1596 | wrh2 | 2007-07-24 06:43:24 +0200 (Tue, 24 Jul 2007) | 5 lines

    Maven:
      * "mvn site" didn't like the assert statement so use the Spring
        Assert class instead.
      * This commit also alphabetizes the imports as well since I'm
        apparently that obsessive.
  ........
................

Revision Links:
--------------
    http://svn.sourceforge.net/jamwiki/?rev=1549&view=rev
    http://svn.sourceforge.net/jamwiki/?rev=1550&view=rev
    http://svn.sourceforge.net/jamwiki/?rev=1553&view=rev

Modified Paths:
--------------
    wiki/trunk/jamwiki/src/main/resources/jamwiki-configuration.xml
    wiki/trunk/jamwiki/src/main/webapp/WEB-INF/jamwiki-servlet.xml
    wiki/trunk/jamwiki/src/test/java/org/jamwiki/test/JAMWikiTestSuite.java

Added Paths:
-----------
    wiki/trunk/jamwiki/src/main/java/org/jamwiki/servlets/ImportTiddlyWikiServlet.java
    wiki/trunk/jamwiki/src/main/java/org/jamwiki/utils/TiddlyWiki2MediaWikiTranslator.java
    wiki/trunk/jamwiki/src/main/java/org/jamwiki/utils/TiddlyWikiParser.java
    wiki/trunk/jamwiki/src/main/webapp/WEB-INF/jsp/importtiddly.jsp
    wiki/trunk/jamwiki/src/test/java/org/jamwiki/test/utils/TiddlyWiki2MediaWikiTranslatorTest.java
    wiki/trunk/jamwiki/src/test/java/org/jamwiki/test/utils/TiddlyWikiParserTest.java

Property Changed:
----------------
    wiki/trunk/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.