Janne, The JUnit tests ReleaseTest.testNewer6() and testOlder6() are failing now, shouldn't the release be 3.0.1 instead of 3.0.0 ?
regards, Harry 2008/11/8 <[EMAIL PROTECTED]> > Author: jalkanen > Date: Sat Nov 8 09:57:08 2008 > New Revision: 712411 > > URL: http://svn.apache.org/viewvc?rev=712411&view=rev > Log: > Merge from 2.8 branch: JSPWIKI-345. > > Added: > incubator/jspwiki/trunk/doc/Translating.txt > - copied unchanged from r712410, > incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/doc/Translating.txt > incubator/jspwiki/trunk/lib/freshcookies-security-0.60.jar (props > changed) > - copied unchanged from r712410, > incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/lib/freshcookies-security-0.60.jar > Removed: > incubator/jspwiki/trunk/lib/freshcookies-security-0.54.jar > Modified: > incubator/jspwiki/trunk/.classpath > incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs > incubator/jspwiki/trunk/ChangeLog > incubator/jspwiki/trunk/LICENSE > incubator/jspwiki/trunk/build.xml > incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java > incubator/jspwiki/trunk/tests/TranslationsCheck.java > > > incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java > incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy > > Modified: incubator/jspwiki/trunk/.classpath > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/.classpath (original) > +++ incubator/jspwiki/trunk/.classpath Sat Nov 8 09:57:08 2008 > @@ -25,7 +25,7 @@ > <classpathentry kind="lib" path="lib/mail.jar"/> > <classpathentry kind="lib" path="lib/activation.jar"/> > <classpathentry kind="lib" path="etc/i18n"/> > - <classpathentry kind="lib" > path="lib/freshcookies-security-0.54.jar"/> > + <classpathentry kind="lib" > path="lib/freshcookies-security-0.60.jar"/> > <classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/> > <classpathentry kind="lib" > path="lib/jakarta-taglibs-jstl-1.1.2.jar"/> > <classpathentry kind="lib" > path="lib/jakarta-tablibs-standard-1.1.2.jar"/> > > Modified: > incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs > (original) > +++ incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs Sat > Nov 8 09:57:08 2008 > @@ -1,4 +1,4 @@ > -#Thu Nov 06 11:42:05 EET 2008 > +#Sat Nov 08 19:15:42 EET 2008 > eclipse.preferences.version=1 > encoding//etc/i18n/templates/default_de.properties=ISO-8859-1 > encoding//src/wikipages/fi/ApprovalRequiredForPageChanges.txt=UTF-8 > > Modified: incubator/jspwiki/trunk/ChangeLog > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/ChangeLog (original) > +++ incubator/jspwiki/trunk/ChangeLog Sat Nov 8 09:57:08 2008 > @@ -1,3 +1,17 @@ > +2008-11-08 Janne Jalkanen <[EMAIL PROTECTED]> > + > + * 3.0.0-svn-1 > + > + * Merged from the 2.8 branch: > + > + * JSPWIKI-345 > + > + * Added doc/Translating.txt as a guide for people who want to > create > + translations. > + > + * Added ant "i18n-check" target as an interface > + to TranslationsCheck (no need to get geeky running a Java class). > + > 2008-11-06 Janne Jalkanen <[EMAIL PROTECTED]> > > * Merged from 2.8: [JSPWIKI-416]: French translation and corepages > from Olivier Descout > > Modified: incubator/jspwiki/trunk/LICENSE > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/LICENSE?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/LICENSE (original) > +++ incubator/jspwiki/trunk/LICENSE Sat Nov 8 09:57:08 2008 > @@ -216,7 +216,7 @@ > commons-lang-2.3.jar LICENSE > commons-logging-api.jar > LICENSE > ecs.jar > LICENSE > -freshcookies-security-0.54.jar LICENSE > +freshcookies-security-0.60.jar LICENSE > jakarta-taglibs-standard-1.1.2.jar LICENSE > jakarta-taglibs-jstl-1.1.2.jar LICENSE > jaxen.jar > doc/LICENSE.jaxen > > Modified: incubator/jspwiki/trunk/build.xml > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/build.xml (original) > +++ incubator/jspwiki/trunk/build.xml Sat Nov 8 09:57:08 2008 > @@ -1440,6 +1440,17 @@ > <delete dir="${tmplt.i18n.dir}" /> > </target> > > + <target name="i18n-check" depends="compile,compiletests" > + description="Run this target to check whether a translation > is up to date."> > + <input message="Please give the language you want to check > translation for (e.g. fi, es, de)" > + addproperty="check.language"/> > + <java classname="TranslationsCheck"> > + <classpath path="${tests.build}"/> > + <classpath path="${code.build}"/> > + <arg line="${check.language}"/> > + </java> > + </target> > + > <target name="api-diff" description="Compares API in JSPWiki.jar with > previous version" > depends="jar"> > <!-- Assumes that the dependencyfinder.dir property points to the > > Propchange: incubator/jspwiki/trunk/lib/freshcookies-security-0.60.jar > > ------------------------------------------------------------------------------ > svn:mime-type = application/octet-stream > > Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original) > +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sat Nov 8 > 09:57:08 2008 > @@ -57,13 +57,13 @@ > * <p> > * If the POSTFIX is empty, it is not added to the version string. > */ > - private static final String POSTFIX = "beta"; > + private static final String POSTFIX = "svn"; > > /** The JSPWiki major version. */ > - public static final int VERSION = 2; > + public static final int VERSION = 3; > > /** The JSPWiki revision. */ > - public static final int REVISION = 8; > + public static final int REVISION = 0; > > /** The minor revision. */ > public static final int MINORREVISION = 0; > @@ -77,7 +77,7 @@ > * <p> > * If the build identifier is empty, it is not added. > */ > - public static final String BUILD = "21"; > + public static final String BUILD = "1"; > > /** > * This is the generic version string you should use > > Modified: incubator/jspwiki/trunk/tests/TranslationsCheck.java > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/TranslationsCheck.java?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/tests/TranslationsCheck.java (original) > +++ incubator/jspwiki/trunk/tests/TranslationsCheck.java Sat Nov 8 > 09:57:08 2008 > @@ -46,27 +46,49 @@ > System.out.println("Internationalization property file differences > between 'default en' and '" > + suffix + "' following:\n"); > > - diff("/etc/i18n/CoreResources.properties", > - "/etc/i18n/CoreResources_" + suffix + ".properties"); > - detectDuplicates("/etc/i18n/CoreResources_" + suffix + > ".properties"); > - > - diff("/etc/i18n/templates/default.properties", > - "/etc/i18n/templates/default_" + suffix + ".properties"); > - detectDuplicates("/etc/i18n/templates/default_" + suffix + > ".properties"); > - > - diff("/etc/i18n/plugin/PluginResources.properties", > - "/etc/i18n/plugin/PluginResources_" + suffix + > ".properties"); > - detectDuplicates("/etc/i18n/plugin/PluginResources_" + suffix + > ".properties"); > + try > + { > + diff("/etc/i18n/CoreResources.properties", > + "/etc/i18n/CoreResources_" + suffix + ".properties"); > + detectDuplicates("/etc/i18n/CoreResources_" + suffix + > ".properties"); > + } > + catch( FileNotFoundException e ) > + { > + System.err.println("Unable to locate > "+"/etc/i18n/CoreResources_" + suffix + ".properties"); > + } > + > + try > + { > + diff("/etc/i18n/templates/default.properties", > + "/etc/i18n/templates/default_" + suffix + ".properties"); > + detectDuplicates("/etc/i18n/templates/default_" + suffix + > ".properties"); > + } > + catch( FileNotFoundException e ) > + { > + System.err.println("Unable to locate > "+"/etc/i18n/templates/default_" + suffix + ".properties"); > + } > > - System.out.println("Duplicates overall (two or more > occurences):"); > - > System.out.println("--------------------------------------------"); > - Iterator iter = duplProps.iterator(); > - if (duplProps.size() == 0) > - System.out.println("(none)"); > - else > - while (iter.hasNext()) > - System.out.println(iter.next()); > - System.out.println(); > + try > + { > + diff("/etc/i18n/plugin/PluginResources.properties", > + "/etc/i18n/plugin/PluginResources_" + suffix + > ".properties"); > + > + detectDuplicates("/etc/i18n/plugin/PluginResources_" + suffix > + ".properties"); > + > + System.out.println("Duplicates overall (two or more > occurences):"); > + > System.out.println("--------------------------------------------"); > + Iterator iter = duplProps.iterator(); > + if (duplProps.size() == 0) > + System.out.println("(none)"); > + else > + while (iter.hasNext()) > + System.out.println(iter.next()); > + System.out.println(); > + } > + catch( FileNotFoundException e ) > + { > + System.err.println("Unable to locate > "+"/etc/i18n/plugin/PluginResources_" + suffix + ".properties"); > + } > > System.out.println("NOTE: Please remember that dependent on the > usage of these i18n files, outdated " + > "properties maybe should not be deleted, because > they may be used by previous releases. " + > > Modified: > incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- > incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java > (original) > +++ > incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java > Sat Nov 8 09:57:08 2008 > @@ -707,12 +707,12 @@ > > s = WikiSessionTest.authenticatedSession( m_engine, Users.BOB, > Users.BOB_PASS ); > assertTrue( "Bob view", m_auth.checkStaticPermission( s, > PagePermission.VIEW ) ); > - assertFalse( "Bob edit", m_auth.checkStaticPermission( s, > PagePermission.EDIT ) ); > - assertFalse( "Bob comment", m_auth.checkStaticPermission( s, > PagePermission.COMMENT ) ); > - assertFalse( "Bob modify", m_auth.checkStaticPermission( s, > PagePermission.MODIFY ) ); > - assertFalse( "Bob upload", m_auth.checkStaticPermission( s, > PagePermission.UPLOAD ) ); > + assertTrue( "Bob edit", m_auth.checkStaticPermission( s, > PagePermission.EDIT ) ); > + assertTrue( "Bob comment", m_auth.checkStaticPermission( s, > PagePermission.COMMENT ) ); > + assertTrue( "Bob modify", m_auth.checkStaticPermission( s, > PagePermission.MODIFY ) ); > + assertTrue( "Bob upload", m_auth.checkStaticPermission( s, > PagePermission.UPLOAD ) ); > assertFalse( "Bob rename", m_auth.checkStaticPermission( s, > PagePermission.RENAME ) ); > - assertFalse( "Bob delete", m_auth.checkStaticPermission( s, > PagePermission.DELETE ) ); > + assertTrue( "Bob delete", m_auth.checkStaticPermission( s, > PagePermission.DELETE ) ); > assertFalse( "Bob prefs", m_auth.checkStaticPermission( s, > WikiPermission.EDIT_PREFERENCES ) ); > assertFalse( "Bob profile", m_auth.checkStaticPermission( s, > WikiPermission.EDIT_PROFILE ) ); > assertFalse( "Bob pages", m_auth.checkStaticPermission( s, > WikiPermission.CREATE_PAGES ) ); > > Modified: incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy?rev=712411&r1=712410&r2=712411&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy > (original) > +++ incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy Sat Nov > 8 09:57:08 2008 > @@ -9,3 +9,7 @@ > grant principal com.ecyrd.jspwiki.auth.WikiPrincipal "Janne Jalkanen" { > permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", > "edit,delete"; > }; > + > +grant principal "Bob" { > + permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", > "edit,delete"; > +}; > > >
