From jspwiki-commits-return-1575charlesabbott@example.net Sat Sep 05 12:26:06 2009 Return-Path: <jspwiki-commits-return-1575charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 83561 invoked from network); 5 Sep 2009 12:26:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Sep 2009 12:26:06 -0000 Received: (qmail 11692 invoked by uid 500); 5 Sep 2009 12:26:06 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 11674 invoked by uid 500); 5 Sep 2009 12:26:06 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 11665 invoked by uid 99); 5 Sep 2009 12:26:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Sep 2009 12:26:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Sep 2009 12:26:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 168342388897; Sat, 5 Sep 2009 12:25:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811629 - /incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp Date: Sat, 05 Sep 2009 12:25:44 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: metskem Date: Sat Sep 5 12:25:43 2009 New Revision: 811629 URL: http://svn.apache.org/viewvc?rev=811629&view=rev Log: added ${templates['DefaultLayout.jsp']} (as is the case for all other jsp's) Modified: incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp Modified: incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp?rev=811629&r1=811628&r2=811629&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp (original) +++ incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp Sat Sep 5 12:25:43 2009 @@ -20,7 +20,7 @@ --%> <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %> <s:useActionBean beanclass="org.apache.wiki.action.UserProfileActionBean" event="create" id="wikiActionBean" /> -<s:layout-render name=""> +<s:layout-render name="${templates['DefaultLayout.jsp']}"> <s:layout-component name="content"> <jsp:include page="${templates['CreateProfileContent.jsp']}" /> </s:layout-component> From jspwiki-commits-return-1576charlesabbott@example.net Sun Sep 06 12:10:50 2009 Return-Path: <jspwiki-commits-return-1576charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 6093 invoked from network); 6 Sep 2009 12:10:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Sep 2009 12:10:50 -0000 Received: (qmail 2427 invoked by uid 500); 6 Sep 2009 12:10:50 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 2409 invoked by uid 500); 6 Sep 2009 12:10:50 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 2400 invoked by uid 99); 6 Sep 2009 12:10:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Sep 2009 12:10:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Sep 2009 12:10:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EF71923888AD; Sun, 6 Sep 2009 12:10:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811818 - in /incubator/jspwiki/trunk: ChangeLog build.xml src/java/org/apache/wiki/Release.java tests/lib/yuicompressor-2.3.3.jar tests/lib/yuicompressor-2.4.2.jar Date: Sun, 06 Sep 2009 12:10:27 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: metskem Date: Sun Sep 6 12:10:27 2009 New Revision: 811818 URL: http://svn.apache.org/viewvc?rev=811818&view=rev Log: 3.0.0-svn-151 * JSPWIKI-597: Upgrade yuicompressor from 2.3.3 to 2.4.2 to solve RuntimeExceptions when using OpenJDK. Added: incubator/jspwiki/trunk/tests/lib/yuicompressor-2.4.2.jar (with props) Removed: incubator/jspwiki/trunk/tests/lib/yuicompressor-2.3.3.jar Modified: incubator/jspwiki/trunk/ChangeLog incubator/jspwiki/trunk/build.xml incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Modified: incubator/jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=811818&r1=811817&r2=811818&view=diff ============================================================================== --- incubator/jspwiki/trunk/ChangeLog (original) +++ incubator/jspwiki/trunk/ChangeLog Sun Sep 6 12:10:27 2009 @@ -1,3 +1,10 @@ +2009-09-06 Harry Metske <charlesabbott@example.net> + + * 3.0.0-svn-151 + + * JSPWIKI-597: Upgrade yuicompressor from 2.3.3 to 2.4.2 to solve + RuntimeExceptions when using OpenJDK. + 2009-08-30 Harry Metske <charlesabbott@example.net> * 3.0.0-svn-150 Modified: incubator/jspwiki/trunk/build.xml URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=811818&r1=811817&r2=811818&view=diff ============================================================================== --- incubator/jspwiki/trunk/build.xml (original) +++ incubator/jspwiki/trunk/build.xml Sun Sep 6 12:10:27 2009 @@ -462,7 +462,7 @@ <attribute name="src"/> <attribute name="args" default=""/> <sequential> - <java jar="${tests}/lib/yuicompressor-2.3.3.jar" + <java jar="${tests}/lib/yuicompressor-2.4.2.jar" output="${tmpdir}/compress/webdocs/@{src}" fork="true"> <arg line="'${code.web}/@{src}' @{args}" /> Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=811818&r1=811817&r2=811818&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Sep 6 12:10:27 2009 @@ -77,7 +77,7 @@ * <p> * If the build identifier is empty, it is not added. */ - public static final String BUILD = "150"; + public static final String BUILD = "151"; /** * This is the generic version string you should use Added: incubator/jspwiki/trunk/tests/lib/yuicompressor-2.4.2.jar URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/lib/yuicompressor-2.4.2.jar?rev=811818&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/jspwiki/trunk/tests/lib/yuicompressor-2.4.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream From jspwiki-commits-return-1577charlesabbott@example.net Sun Sep 06 12:17:41 2009 Return-Path: <jspwiki-commits-return-1577charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 7366 invoked from network); 6 Sep 2009 12:17:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Sep 2009 12:17:41 -0000 Received: (qmail 6603 invoked by uid 500); 6 Sep 2009 12:17:41 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 6584 invoked by uid 500); 6 Sep 2009 12:17:41 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 6575 invoked by uid 99); 6 Sep 2009 12:17:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Sep 2009 12:17:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Sep 2009 12:17:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 19A752388872; Sun, 6 Sep 2009 12:17:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811820 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog build.xml src/com/ecyrd/jspwiki/Release.java tests/lib/yuicompressor-2.3.3.jar tests/lib/yuicompressor-2.4.2.jar Date: Sun, 06 Sep 2009 12:17:17 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: metskem Date: Sun Sep 6 12:17:16 2009 New Revision: 811820 URL: http://svn.apache.org/viewvc?rev=811820&view=rev Log: 3.0.0-svn-151 * JSPWIKI-597: Upgrade yuicompressor from 2.3.3 to 2.4.2 to solve RuntimeExceptions when using OpenJDK. Added: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/lib/yuicompressor-2.4.2.jar (with props) Removed: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/lib/yuicompressor-2.3.3.jar Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=811820&r1=811819&r2=811820&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original) +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sun Sep 6 12:17:16 2009 @@ -1,3 +1,11 @@ +2009-09-06 Harry Metske <charlesabbott@example.net> + + * 2.8.3-svn-18 + + * JSPWIKI-597: Upgrade yuicompressor from 2.3.3 to 2.4.2 to solve + RuntimeExceptions when using OpenJDK. + + 2009-08-30 Harry Metske <charlesabbott@example.net> * 2.8.3-svn-17 Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml?rev=811820&r1=811819&r2=811820&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml (original) +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml Sun Sep 6 12:17:16 2009 @@ -422,7 +422,7 @@ <attribute name="src"/> <attribute name="args" default=""/> <sequential> - <java jar="tests/lib/yuicompressor-2.3.3.jar" + <java jar="tests/lib/yuicompressor-2.4.2.jar" output="${tmpdir}/compress/@{src}" fork="true"> <arg line="'${code.src}/@{src}' @{args}" /> Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=811820&r1=811819&r2=811820&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Sun Sep 6 12:17:16 2009 @@ -77,7 +77,7 @@ * <p> * If the build identifier is empty, it is not added. */ - public static final String BUILD = "17"; + public static final String BUILD = "18"; /** * This is the generic version string you should use Added: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/lib/yuicompressor-2.4.2.jar URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/lib/yuicompressor-2.4.2.jar?rev=811820&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/lib/yuicompressor-2.4.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream From jspwiki-commits-return-1578charlesabbott@example.net Mon Sep 07 03:28:04 2009 Return-Path: <jspwiki-commits-return-1578charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 70031 invoked from network); 7 Sep 2009 03:28:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Sep 2009 03:28:03 -0000 Received: (qmail 87631 invoked by uid 500); 7 Sep 2009 03:28:03 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 87609 invoked by uid 500); 7 Sep 2009 03:28:03 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 87600 invoked by uid 99); 7 Sep 2009 03:28:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:28:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:28:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6EE9323888A0; Mon, 7 Sep 2009 03:27:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811981 - /incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java Date: Mon, 07 Sep 2009 03:27:40 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Mon Sep 7 03:27:38 2009 New Revision: 811981 URL: http://svn.apache.org/viewvc?rev=811981&view=rev Log: [JSPWIKI-599]: fixed NPEs in DefaultWikiContext. Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java?rev=811981&r1=811980&r2=811981&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java Mon Sep 7 03:27:38 2009 @@ -129,8 +129,8 @@ copy.m_variableMap = (HashMap<String, Object>) m_variableMap.clone(); copy.m_request = m_request; copy.m_session = m_session; - copy.m_page = (WikiPage) m_page.clone(); - copy.m_realPage = (WikiPage) m_realPage.clone(); + copy.m_page = m_page == null ? null : (WikiPage) m_page.clone(); + copy.m_realPage = m_realPage == null ? null : (WikiPage) m_realPage.clone(); return copy; } catch( CloneNotSupportedException e ) From jspwiki-commits-return-1579charlesabbott@example.net Mon Sep 07 03:30:03 2009 Return-Path: <jspwiki-commits-return-1579charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 70380 invoked from network); 7 Sep 2009 03:30:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Sep 2009 03:30:03 -0000 Received: (qmail 87971 invoked by uid 500); 7 Sep 2009 03:30:03 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 87949 invoked by uid 500); 7 Sep 2009 03:30:02 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 87940 invoked by uid 99); 7 Sep 2009 03:30:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:30:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:30:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D9B1E2388906; Mon, 7 Sep 2009 03:29:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811985 - /incubator/jspwiki/trunk/src/java/org/apache/wiki/util/CommentedProperties.java Date: Mon, 07 Sep 2009 03:29:40 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Mon Sep 7 03:29:40 2009 New Revision: 811985 URL: http://svn.apache.org/viewvc?rev=811985&view=rev Log: Fixed bug in CommentedProperties. Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/CommentedProperties.java Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/CommentedProperties.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/CommentedProperties.java?rev=811985&r1=811984&r2=811985&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/util/CommentedProperties.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/CommentedProperties.java Mon Sep 7 03:29:40 2009 @@ -192,7 +192,7 @@ private void writeText( BufferedWriter writer, Object entry, EscapeMode mode ) throws IOException { - String e = entry.toString(); + String e = entry == null ? "" : entry.toString(); boolean leadingSpaces = true; for( int i = 0; i < e.length(); i++ ) { From jspwiki-commits-return-1580charlesabbott@example.net Mon Sep 07 03:30:04 2009 Return-Path: <jspwiki-commits-return-1580charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 70388 invoked from network); 7 Sep 2009 03:30:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Sep 2009 03:30:04 -0000 Received: (qmail 88004 invoked by uid 500); 7 Sep 2009 03:30:04 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 87982 invoked by uid 500); 7 Sep 2009 03:30:04 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 87973 invoked by uid 99); 7 Sep 2009 03:30:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:30:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:30:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F06F723888A0; Mon, 7 Sep 2009 03:29:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811983 - /incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Date: Mon, 07 Sep 2009 03:29:36 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Mon Sep 7 03:29:36 2009 New Revision: 811983 URL: http://svn.apache.org/viewvc?rev=811983&view=rev Log: WikiEngine gains a new method restart() which does what you'd imagine. InstallActionBean relies on restart() to make "instant setup" possible. Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?rev=811983&r1=811982&r2=811983&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Mon Sep 7 03:29:36 2009 @@ -1552,6 +1552,16 @@ } /** + * Restarts the WikiEngine. + */ + public void restart() throws WikiException + { + shutdown(); + m_properties = PropertyReader.loadWebAppProps( m_servletContext ); + initialize( m_properties ); + } + + /** * Protected method that signals that the WikiEngine will be * shut down by the servlet container. It is called by * {@link WikiServlet#destroy()}. When this method is called, From jspwiki-commits-return-1581charlesabbott@example.net Mon Sep 07 03:32:06 2009 Return-Path: <jspwiki-commits-return-1581charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 71880 invoked from network); 7 Sep 2009 03:32:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Sep 2009 03:32:06 -0000 Received: (qmail 88662 invoked by uid 500); 7 Sep 2009 03:32:06 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 88642 invoked by uid 500); 7 Sep 2009 03:32:06 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 88633 invoked by uid 99); 7 Sep 2009 03:32:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:32:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:32:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2FCBB23888A0; Mon, 7 Sep 2009 03:31:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811986 - in /incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib: freshcookies-security-0.61.jar freshcookies-security-0.62.jar Date: Mon, 07 Sep 2009 03:31:43 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Mon Sep 7 03:31:42 2009 New Revision: 811986 URL: http://svn.apache.org/viewvc?rev=811986&view=rev Log: Fixed bug in Keychain code. Added: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.62.jar (with props) Removed: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.61.jar Added: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.62.jar URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.62.jar?rev=811986&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.62.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream From jspwiki-commits-return-1582charlesabbott@example.net Mon Sep 07 03:34:31 2009 Return-Path: <jspwiki-commits-return-1582charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 72615 invoked from network); 7 Sep 2009 03:34:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Sep 2009 03:34:31 -0000 Received: (qmail 89435 invoked by uid 500); 7 Sep 2009 03:34:31 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 89414 invoked by uid 500); 7 Sep 2009 03:34:31 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 89405 invoked by uid 99); 7 Sep 2009 03:34:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:34:31 +0000 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:34:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 99D8923888A0; Mon, 7 Sep 2009 03:33:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811987 - in /incubator/jspwiki/trunk: src/java/org/apache/wiki/auth/ src/java/org/apache/wiki/auth/user/ tests/etc/ tests/etc/WEB-INF/ tests/java/org/apache/wiki/auth/authorize/ Date: Mon, 07 Sep 2009 03:33:57 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Mon Sep 7 03:33:54 2009 New Revision: 811987 URL: http://svn.apache.org/viewvc?rev=811987&view=rev Log: Fixed small bugs in Ldap support code and added sample keychain to tests/etc. Added: incubator/jspwiki/trunk/tests/etc/WEB-INF/keychain (with props) Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/LdapConfig.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/LdapUserDatabase.java incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/LdapConfig.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/LdapConfig.java?rev=811987&r1=811986&r2=811987&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/LdapConfig.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/LdapConfig.java Mon Sep 7 03:33:54 2009 @@ -53,42 +53,43 @@ * </p> * <ul> * <li>{@link #PROPERTY_CONNECTION_URL} - the connection string for the LDAP - * server, for example <code>ldap://ldap.jspwiki.org:389/</code>.</li> + * server, for example {@code ldap://ldap.jspwiki.org:389/}.</li> * <li>{@link #PROPERTY_LOGIN_ID_PATTERN} - optional string pattern indicating * how the login id should be formatted into a credential the LDAP server will * understand. The exact credential pattern varies by LDAP server. OpenLDAP * expects login IDs that match a distinguished name. Active Directory, on the * other hand, requires just the "short" login ID that is not in DN format. The * user ID supplied during the login will be substituted into the - * <code>{0}</code> token in this pattern. Valid examples of login ID patterns - * include <code>uid={0},ou=users,dc=jspwiki,dc=org</code> (for OpenLDAP) and - * <code>{0}</code> (for Active Directory).</li> + * {@code \{0\}} token in this pattern, and the user base will be + * substituted into the {@code \{1\}} token. Valid examples of login ID patterns + * include {@code uid=\{0\},\{1\}} (for OpenLDAP) and + * {@code \{0\}} (for Active Directory).</li> * <li>{@link #PROPERTY_USER_BASE} - the distinguished name of the base location * where user objects are located. This is generally an organizational unit (OU) - * DN, such as <code>ou=people,dc=jspwiki,dc=org</code>. The user base and all + * DN, such as {@code ou=people,dc=jspwiki,dc=org}. The user base and all * of its subtrees will be searched. For directories that contain multiple OUs * where users are located, use a higher-level base location (e.g., - * <code>dc=jspwiki,dc=org</code>).</li> + * {@code dc=jspwiki,dc=org}).</li> * <li>{@link #PROPERTY_USER_FILTER} - an RFC 2254 search filter string used for * locating the actual user object within the user base. The user ID supplied - * during the login will be substituted into the <code>{0}</code> token in this + * during the login will be substituted into the {@code \{0\}} token in this * filter, if it contains one. Only the first match will be selected, so it is * important that this filter selects unique objects. For example, if the user - * filter is <code>(&(objectClass=inetOrgPerson)(uid={0}))</code> and the user - * name supplied during login is <code>fflintstone</code>, the the first object + * filter is {@code (&(objectClass=inetOrgPerson)(uid=\{0\}))} and the user + * name supplied during login is {@code fflintstone}, the the first object * within {@link #PROPERTY_USER_BASE} that matches the filter - * <code>(&(objectClass=inetOrgPerson)(uid=fflintstone))</code> will be + * {@code (&(objectClass=inetOrgPerson)(uid=fflintstone))} will be * selected. A suitable value for this property that works with Active Directory - * 2000 and later is <code>(&(objectClass=person)(sAMAccountName={0}))</code>.</li> + * 2000 and later is {@code (&(objectClass=person)(sAMAccountName=\{0\}))}.</li> * <li>{@link #PROPERTY_SSL} - Optional parameter that specifies whether to use - * SSL when connecting to the LDAP server. Values like <code>true</code> or - * <code>on</code> indicate that SSL should be used. If this parameter is not + * SSL when connecting to the LDAP server. Values like {@code true} or + * {@code on} indicate that SSL should be used. If this parameter is not * supplied, SSL will not be used.</li> * <li>{@link #PROPERTY_AUTHENTICATION} - Optional parameter that specifies the * type of authentication method to be used. Valid values include - * <code>simple</code> for plaintext username/password, and - * <code>DIGEST-MD5</code> for digested passwords. Note that if SSL is not used, - * for safety reasons this method will default to <code>DIGEST-MD5</code> to + * {@code simple} for plaintext username/password, and + * {@code DIGEST-MD5} for digested passwords. Note that if SSL is not used, + * for safety reasons this method will default to {@code DIGEST-MD5} to * prevent password interception.</li> * </ul> * <p> @@ -134,19 +135,19 @@ /** * Property that supplies the filter for finding users within the role base * that possess a given role, e.g. {@code - * (&(objectClass=groupOfUniqueNames)(cn= 0})(uniqueMember={1}))} . + * (&(objectClass=groupOfUniqueNames)(cn=\{0\})(uniqueMember=\{1\}))} . */ public static final String PROPERTY_IS_IN_ROLE_FILTER = "ldap.isInRoleFilter"; /** * Property that specifies the pattern for the username used to log in to * the LDAP server. This pattern maps the username supplied at login time by - * the user to a username format the LDAP server can recognized. Usually - * this is a pattern that produces a full DN, for example {@code uid= 0} - * ,ou=people,dc=jspwiki,dc=org}. However, sometimes (as with Active + * the user to a username format the LDAP server can recognized. The Usually + * this is a pattern that produces a full DN, for example {@code uid=\{0\} + * ,\{1\}}. However, sometimes (as with Active * Directory 2003 and later) only the userid is used, in which case the - * principal will simply be {@code 0} . The default value if not supplied is - * {@code 0} . + * principal will simply be \{0\} . The default value if not supplied is + * \{0\} . */ public static final String PROPERTY_LOGIN_ID_PATTERN = "ldap.loginIdPattern"; @@ -209,6 +210,7 @@ // OpenLDAP defaults options = new HashMap<String, String>(); options.put( PROPERTY_IS_IN_ROLE_FILTER, "(&(&(objectClass=groupOfUniqueNames)(cn={0}))(uniqueMember={1}))" ); + options.put( PROPERTY_LOGIN_ID_PATTERN, "uid={0},{1}" ); options.put( PROPERTY_USER_LOGIN_NAME_ATTRIBUTE, "uid" ); options.put( PROPERTY_USER_OBJECT_CLASS, "inetOrgPerson" ); options.put( PROPERTY_USER_FILTER, "(&(objectClass=inetOrgPerson)(uid={0}))" ); @@ -522,7 +524,8 @@ { authentication = parsedAuthentication; } - loginIdPattern = getProperty( props, PROPERTY_LOGIN_ID_PATTERN, defaultLoginIdPattern ); + String parsedLoginIdPattern = getProperty( props, PROPERTY_LOGIN_ID_PATTERN, defaultLoginIdPattern ); + loginIdPattern = userBase == null ? parsedLoginIdPattern : parsedLoginIdPattern.replace( "{1}", userBase ); // Optional user object attributes userObjectClass = getProperty( props, PROPERTY_USER_OBJECT_CLASS, defaultUserObjectClass ); @@ -613,6 +616,12 @@ Hashtable<String, String> env = new Hashtable<String, String>(); env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" ); + // Create fully qualified username + if ( loginIdPattern != null && username != null ) + { + username = loginIdPattern.replace( "{0}", username ); + } + // LDAP server to authenticate to env.put( Context.PROVIDER_URL, connectionUrl ); @@ -620,11 +629,10 @@ if( username != null ) { env.put( Context.SECURITY_PRINCIPAL, username ); - env.put( Context.SECURITY_CREDENTIALS, password ); } - else + if ( password != null ) { - + env.put( Context.SECURITY_CREDENTIALS, password ); } // Use SSL? @@ -653,7 +661,7 @@ throw new KeyStoreException( "LdapConfig was initialized without a keychain!" ); } KeyStore.Entry password = m_keychain.getEntry( LdapConfig.KEYCHAIN_BIND_DN_ENTRY ); - if( password instanceof Keychain.Password ) + if( password != null && password instanceof Keychain.Password ) { return ((Keychain.Password) password).getPassword(); } Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/LdapUserDatabase.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/LdapUserDatabase.java?rev=811987&r1=811986&r2=811987&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/LdapUserDatabase.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/LdapUserDatabase.java Mon Sep 7 03:33:54 2009 @@ -183,10 +183,7 @@ */ public boolean validatePassword( String loginName, String password ) { - String userPattern = m_cfg.loginIdPattern; - String username = userPattern.replace( "{0}", loginName ); - - Hashtable<String, String> env = m_cfg.newJndiEnvironment( username, password ); + Hashtable<String, String> env = m_cfg.newJndiEnvironment( loginName, password ); try { new InitialLdapContext( env, null ); Added: incubator/jspwiki/trunk/tests/etc/WEB-INF/keychain URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/WEB-INF/keychain?rev=811987&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/jspwiki/trunk/tests/etc/WEB-INF/keychain ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl?rev=811987&r1=811986&r2=811987&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl (original) +++ incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl Mon Sep 7 03:33:54 2009 @@ -134,3 +134,8 @@ # URL Constructor jspwiki.urlConstructor = StripesURLConstructor + +# Keychain and admin password +admin.passwordHash={SSHA}JtQ3xFdBNDuYw5R8u8nhsg5xqsUpbiZhvOoisQ== +jspwiki.keychainPassword=Ga5ZrVe859WUPqG8 + Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java?rev=811987&r1=811986&r2=811987&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java Mon Sep 7 03:33:54 2009 @@ -75,7 +75,7 @@ props.put( AuthorizationManager.PROP_AUTHORIZER, LdapAuthorizer.class.getCanonicalName() ); props.put( LdapConfig.PROPERTY_ROLE_BASE, "ou=roles,dc=jspwiki,dc=org" ); props.put( LdapConfig.PROPERTY_IS_IN_ROLE_FILTER, "(&(&(objectClass=groupOfUniqueNames)(cn={0}))(uniqueMember={1}))" ); - props.put( LdapConfig.PROPERTY_BIND_DN, "uid=Fred,ou=people,dc=jspwiki,dc=org" ); + props.put( LdapConfig.PROPERTY_BIND_DN, "Fred" ); props.put( AuthenticationManager.PROP_KEYCHAIN_PATH, "test-keychain" ); props.put( AuthenticationManager.PROP_KEYCHAIN_PASSWORD, "keychain-password" ); From jspwiki-commits-return-1583charlesabbott@example.net Mon Sep 07 03:35:38 2009 Return-Path: <jspwiki-commits-return-1583charlesabbott@example.net> Delivered-To: charlesabbott@example.net Received: (qmail 72969 invoked from network); 7 Sep 2009 03:35:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Sep 2009 03:35:38 -0000 Received: (qmail 90008 invoked by uid 500); 7 Sep 2009 03:35:38 -0000 Delivered-To: charlesabbott@example.net Received: (qmail 89985 invoked by uid 500); 7 Sep 2009 03:35:38 -0000 Mailing-List: contact charlesabbott@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:charlesabbott@example.net> List-Unsubscribe: <mailto:charlesabbott@example.net> List-Post: <mailto:charlesabbott@example.net> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: charlesabbott@example.net Delivered-To: mailing list charlesabbott@example.net Received: (qmail 89976 invoked by uid 99); 7 Sep 2009 03:35:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:35:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 03:35:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0782D23888A0; Mon, 7 Sep 2009 03:35:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r811988 [1/3] - in /incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes: ./ templates/ Date: Mon, 07 Sep 2009 03:35:10 -0000 To: charlesabbott@example.net From: charlesabbott@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <charlesabbott@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Mon Sep 7 03:35:09 2009 New Revision: 811988 URL: http://svn.apache.org/viewvc?rev=811988&view=rev Log: i18n changes to support new admin/Install.jsp. Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties?rev=811988&r1=811987&r2=811988&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties (original) +++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties Mon Sep 7 03:35:09 2009 @@ -1,6 +1,6 @@ -# + # JSPWiki - a JSP-based WikiWiki clone. -# + # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -8,18 +8,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# + # http://www.apache.org/licenses/LICENSE-2.0 -# + # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. -# +# under the License. + ############################################################################ -# + # This is the main i18n resource file for JSPWiki internal # code, the so-called core code. @@ -116,24 +116,11 @@ captcha.asirra.a.get.challenge=Request different images. captcha.asirra.a.whatsthis=What is this? captcha.submit=Submit -# Install.jsp -install.jsp.title=JSPWiki Installer -install.jsp.intro.title=JSPWiki Installer -install.jsp.intro.p1=Welcome! This little JSP page is here to help you do the first difficult stage of JSPWiki installation. If you're seeing this page, you have already installed JSPWiki correctly inside your container. -install.jsp.intro.p2=There are now some things that you should configure. When you press Configure, the <code>jspwiki.properties</code> file from the distribution will be modified, or if it can't be found, a new one will be created. -install.jsp.intro.p3=This setup system is really meant for people who just want to be up and running really quickly. If you want to integrate JSPWiki with an existing system, I would recommend that you go and edit the <code>jspwiki.properties</code> file directly. You can find a sample config file from <code>yourwiki/WEB-INF/</code>. install.jsp.install.info=Good news: install.jsp.install.warning=Warning: install.jsp.install.error=Could not save configuration: install.jsp.install.msg.rnd.pwd=Because no administrator account exists yet, JSPWiki created one for you, with a random password. You can change this password later, of course. The account''s id is {0} and the password is {1}. Please write this information down and keep it in a safe place. JSPWiki also created a wiki group called {2} that contains this user. install.jsp.install.msg.admin.notexists=Is this the first time you've run the Installer? If it is, you should know that after JSPWiki validates and saves your configuration for the first time, you will need administrative privileges to access this page again. We do this to prevent random people on the Internet from doing bad things to your wiki. -install.jsp.basics.title=Basics -install.jsp.basics.appname.label=Application Name -install.jsp.basics.appname.desc=What should your wiki be called? Try and make this a relatively short name. -install.jsp.basics.baseurl.label=Base URL -install.jsp.basics.baseurl.desc=Please tell JSPWiki where your wiki is located. -install.jsp.basics.page.storage.label=Page storage -install.jsp.basics.page.storage.desc=By default, JSPWiki will use the VersioningFileProvider that stores files in a particular directory on your hard drive. If you specify a directory that does not exist, JSPWiki will create one for you. All attachments will also be put in the same directory. install.jsp.security.title=Security install.jsp.security.sec.conf.label=Security configuration install.jsp.security.sec.conf.opt1=JAAS plus container security (default) @@ -144,14 +131,6 @@ install.jsp.security.admaccount.notenabled=Not enabled install.jsp.security.admaccount.enabled.desc=This wiki has an administrator account named <strong>admin</strong> that is part of the wiki group <strong>Admin</strong>. By default, JSPWiki's security policy grants all members of the Admin group the all-powerful <code>AllPermission</code>. install.jsp.security.admaccount.notenabled.desc=This wiki doesn't seem to have an administrator account. When you click <em>Configure!</em>,JSPWiki will create one for you. -install.jsp.adv.settings.title=Advanced Settings -install.jsp.adv.settings.logfile.label=Log files -install.jsp.adv.settings.logfile.desc=JSPWiki uses Jakarta Log4j for logging. Please tell JSPWiki where the log files should go. -install.jsp.adv.settings.workdir.label=Work directory -install.jsp.adv.settings.workdir.desc=This is the place where all caches and other runtime stuff is stored. -install.jsp.instr.desc=After you click <em>Configure!</em>, the installer will write your settings to <code>{0}</code>. It will also create an Administrator account with a random password and a corresponding Admin group. -install.jsp.instr.submit=Configure! -install.jsp.validated.new.props=Here is your new jspwiki.properties # Installer.java install.installer.unable.read.props=Unable to read properties: {0} install.installer.default.appname=MyWiki @@ -329,6 +308,36 @@ preview=Preview #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit. cancel=Cancel - edit.conflict=Someone modified the page while you were editing it! The other user's submitted text is shown below. Please merge it with with your text and save the page again. conflictText=The other user's text: +install.ldap.title=LDAP Configuration +#Formerly named install.jsp.instr.submit. +org.apache.wiki.action.InstallActionBean.save=Configure! +org.apache.wiki.action.InstallActionBean.testLdapConnection=Test connection +org.apache.wiki.action.InstallActionBean.testLdapAuthentication=Test authentication +org.apache.wiki.action.InstallActionBean.testLdapUsers=Test user lookups +org.apache.wiki.action.InstallActionBean.testLdapRoles=Test role lookups +Default.ACTIVE_DIRECTORY=Active Directory +Default.OPEN_LDAP=OpenLDAP +bindDNpassword=Password +test.connection=Test connection +ldap.results=Results +org.apache.wiki.action.AdminActionBean.unlock=Unlock keychain +#Formerly named install.jsp.basics.appname.label. +properties.jspwiki.jspwiki_applicationName=Application Name +#Formerly named install.jsp.basics.baseurl.label. +properties.jspwiki.jspwiki_baseURL=Base URL +#Formerly named install.jsp.basics.page.storage.label. +properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Page storage +#Formerly named install.jsp.adv.settings.logfile.label. +properties.log4j.log4j_appender_FileLog_File=Log files +#Formerly named install.jsp.adv.settings.workdir.label. +properties.jspwiki.jspwiki_workDir=Work directory +properties.jspwiki.ldap_config=Server type +properties.jspwiki.ldap_connectionURL=Connection URL +properties.jspwiki.ldap_authentication=Authentication +properties.jspwiki.ldap_ssl=Use SSL? +properties.jspwiki.ldap_bindDN=Bind as user +properties.jspwiki.ldap_userBase=User base +properties.jspwiki.ldap_roleBase=Role base +adminPassword=Admin password Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties?rev=811988&r1=811987&r2=811988&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties (original) +++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties Mon Sep 7 03:35:09 2009 @@ -1,6 +1,6 @@ -# + # JSPWiki - a JSP-based WikiWiki clone. -# + # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -8,18 +8,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# + # http://www.apache.org/licenses/LICENSE-2.0 -# + # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. -# +# under the License. + ############################################################################ -# + # This is the main i18n resource file for JSPWiki internal # code, the so-called core code. @@ -121,24 +121,11 @@ captcha.asirra.a.get.challenge=Lade andere Bilder! captcha.asirra.a.whatsthis=Was ist das? captcha.submit=Weiter -# Install.jsp -install.jsp.title=JSPWiki Installation -install.jsp.intro.title=JSPWiki Installation -install.jsp.intro.p1=Willkommen! Diese kleine Seite ist dazu da, Dir über die ersten Hürden deiner JSPWiki-Installation hinwegzuhelfen. Wenn du diese Seite siehst, hast du JSPWiki bereits korrekt in deinem Container installiert. -install.jsp.intro.p2=Es müssen jetzt ein paar Dinge konfiguriert werden. Wenn du auf 'Weiter' klickst, wird die Datei <code>jspwiki.properties</code> aus der Distribution angepasst oder neu erstellt, falls sie nicht gefunden werden kann. -install.jsp.intro.p3=Dieses Installationsprogramm ist wirklich nur für Leute gedacht, die mit JSPWiki schnell und einfach loslegen wollen. Solltest du JSPWiki in ein bestehendes System integrieren wollen, ist es ratsam die Datei <code>jspwiki.properties</code> von Hand zu bearbeiten. Eine Vorlage findest du unter <code>DeinWiki/WEB-INF/</code>. install.jsp.install.info=Gute Nachrichten: install.jsp.install.warning=Warnung: install.jsp.install.error=Konnte die Konfiguration nicht speichern: install.jsp.install.msg.rnd.pwd=Da bisher noch kein Administratorzugang existiert hat, hat JSPWiki einen mit zufälligem Passwort für dich erstellt. Du kannst dieses Passwort natürlich später ändern. Der Benutzername lautet {0} und das Passwort ist {1}. Bitte schreibe dir diese Zugangsdaten auf und bewahre sie an einem sicheren Platz auf. JSPWiki hat außerdem eine Wiki-Gruppe {2} erstellt, die diesen Benutzer enthält. install.jsp.install.msg.admin.notexists=Rufst du dieses Installationsprogramm zum ersten mal auf? Falls ja solltest du wissen, dass du Administratorrechte benötigst, um auf diese Seite erneut zugreifen zu können, nachdem JSPWiki einmal deine Konfigurationseinstellungen ausgewertet und gespeichert hat. Wir tun das um zu verhindern, dass beliebige Leute aus dem Internet böse Dinge mit deinem Wiki anstellen können. -install.jsp.basics.title=Grundlegendes -install.jsp.basics.appname.label=Anwendungsname -install.jsp.basics.appname.desc=Wie soll dein Wiki heißen? Es sollte ein möglichst kurzer Name sein! -install.jsp.basics.baseurl.label=Basis-URL -install.jsp.basics.baseurl.desc=Bitte gib die Adresse ein, unter der sich dein Wiki befindet! -install.jsp.basics.page.storage.label=Seitenspeicherung -install.jsp.basics.page.storage.desc=Standardmäßig verwendet JSPWiki den VersioningFileProvider, welcher Seiten als einzelne Dateien in einem bestimmten Verzeichnis auf deiner Festplatte abspeichert. Wenn du ein nicht existierendes Verzeichnis angibst, wird JSPWiki eines für dich erstellen. Alle Anhänge werden ebenfalls in diesem Verzeichnis abgespeichert. install.jsp.security.title=Sicherheit install.jsp.security.sec.conf.label=Sicherheitseinstellungen install.jsp.security.sec.conf.opt1=JAAS und Container Security (Standard) @@ -149,14 +136,6 @@ install.jsp.security.admaccount.notenabled=Deaktiviert install.jsp.security.admaccount.enabled.desc=Dieses Wiki verfügt über einen Administratorzugang namens <strong>admin</strong>, der Mitglied der Wiki-Gruppe <strong>Admin</strong> ist. Standardmäßig weisen die Sicherheitseinstellungen von JSPWiki allen Mitgliedern dieser Gruppe sämtliche Rechte zu (<code>AllPermission</code>). install.jsp.security.admaccount.notenabled.desc=Dieses Wiki verfügt offenbar über keinen Administratorzugang. Wenn du auf 'Weiter' klickst, wird JSPWiki einen für dich erstellen. -install.jsp.adv.settings.title=Erweiterte Einstellungen -install.jsp.adv.settings.logfile.label=Log-Dateien -install.jsp.adv.settings.logfile.desc=JSPWiki verwendet Jakarta Log4j fürs Logging. Bitte teile JSPWiki mit, wo die Log-Dateien gespeichert werden sollen. -install.jsp.adv.settings.workdir.label=Arbeitsverzeichnis -install.jsp.adv.settings.workdir.desc=Hier werden sämtliche Caches und andere Laufzeitdaten gespeichert. -install.jsp.instr.desc=Wenn du auf 'Weiter' klickst, wird das Installationsprogramm deine Einstellungen in <code>{0}</code> abspeichern. Es wird außerdem einen Administratorzugang mit einem zufälligen Passwort sowie eine entsprechende Admin-Gruppe erstellen. -install.jsp.instr.submit=Weiter -install.jsp.validated.new.props=Hier ist deine neue jspwiki.properties # Installer.java install.installer.unable.read.props=Fehler beim Lesen der Einstellungen: {0} install.installer.default.appname=MeinWiki @@ -331,6 +310,18 @@ preview=Vorschau #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit. cancel=Abbrechen +#Formerly named install.jsp.instr.submit. +org.apache.wiki.action.InstallActionBean.save=Weiter +#Formerly named install.jsp.basics.appname.label.. Formerly named applicationName. +properties.jspwiki.jspwiki_applicationName=Anwendungsname +#Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL. +properties.jspwiki.jspwiki_baseURL=Basis-URL +#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir. +properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Seitenspeicherung +#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile. +properties.log4j.log4j_appender_FileLog_File=Log-Dateien +#Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir. +properties.jspwiki.jspwiki_workDir=Arbeitsverzeichnis # Outdated or superfluous properties since 3.0.0 # folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties?rev=811988&r1=811987&r2=811988&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties (original) +++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties Mon Sep 7 03:35:09 2009 @@ -1,6 +1,6 @@ -# + # JSPWiki - a JSP-based WikiWiki clone. -# + # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -8,18 +8,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# + # http://www.apache.org/licenses/LICENSE-2.0 -# + # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. -# +# under the License. + ############################################################################ -# + # This is the main i18n resource file for JSPWiki internal # code, the so-called core code. @@ -118,24 +118,11 @@ captcha.asirra.a.get.challenge=Pedir otras imágenes captcha.asirra.a.whatsthis=¿Qué es esto? captcha.submit=Enviar -# Install.jsp -install.jsp.title=Instalador de JSPWiki -install.jsp.intro.title=Instalador de JSPWiki -install.jsp.intro.p1=¡Bienvenido! Esta pequeña JSP está aquí para ayudarte en la primera etapa de la configuración de JSPWiki. Si puedes ver esta página, ya has instalado correctamente JSPWiki en tu contenedor de aplicaciones. -install.jsp.intro.p2=Hay algunas cosas que deberías configurar. Cuando submitas el formulario, el fichero <code>jspwiki.properties</code> de la distribución será modificado, o, si no puede ser encontrado, será creado uno nuevo. -install.jsp.intro.p3=Este método de configuración está pensado para las personas que quieran estar funcionando lo antes posible. Si quieres integrar JSPWiki en un sistema existente, te recomendaría que editases el fichero <code>jspwiki.properties</code> directamente. Puedes encontrar un fichero de ejemplo en <code>tu_wiki/WEB-INF/</code>. install.jsp.install.info=Buenas noticias: install.jsp.install.warning=Aviso: install.jsp.install.error=No se pudo guardar la configuración: install.jsp.install.msg.rnd.pwd=Como todavía no existe ninguna cuenta de administrador, JSPWiki ha creado una para ti, con una contraseña aleatoria. Por supuesto, puedes cambiarla más adelante. El id de la cuenta es {0}, siendo la contraseña {1}. Por favor guarda esta información en un lugar seguro. JSPWiki también ha creado un wiki-grupo llamado {2} que contiene a este usuario. install.jsp.install.msg.admin.notexists=¿Es ésta la primera vez que ejecutas el Instalador? Si es así, deberías saber que una vez JSPWiki haya validado y guardado tu configuración la primera vez, necesitarás privilegios administrativos para acceder a esta página de nuevo. Lo hacemos así para evitar que gente desconocida desde Internet estropee tu wiki. -install.jsp.basics.title=Fundamentales -install.jsp.basics.appname.label=Nombre de la Aplicación -install.jsp.basics.appname.desc=¿Cómo debería llamarse tu wiki? Intenta hacer este nombre relativamente corto. -install.jsp.basics.baseurl.label=URL base -install.jsp.basics.baseurl.desc=Dile a JSPWiki a través de dónde está accesible tu wiki. -install.jsp.basics.page.storage.label=Almacenamiento de páginas -install.jsp.basics.page.storage.desc=Por defecto, JSPWiki usará el VersioningFileProvider que guarda los ficheros en un directorio de tu disco duro. Si especificas un directorio que no existe, JSPWiki creará uno por ti. Todos los ficheros adjuntos también serán guardados en ese directorio. install.jsp.security.title=Seguridad install.jsp.security.sec.conf.label=Configuración de seguridad install.jsp.security.sec.conf.opt1=JAAS + seguridad del contenedor de aplicaciones (por defecto) @@ -146,14 +133,6 @@ install.jsp.security.admaccount.notenabled=No activada install.jsp.security.admaccount.enabled.desc=Este wiki tiene una cuenta de administrador llamada <strong>admin</strong>, que es parte del wiki-grupo <strong>Admin</strong>. Por defecto, la política de seguridad de JSPWiki concede a todos los miembros del grupo Admin el todopoderoso <code>AllPermission</code>. install.jsp.security.admaccount.notenabled.desc=Este wiki no parece tener una cuenta de administrador. Cuando hagas click en <em>¡Configura!</em>, JSPWiki creará uno para ti. -install.jsp.adv.settings.title=Configuración avanzada -install.jsp.adv.settings.logfile.label=Ficheros de log -install.jsp.adv.settings.logfile.desc=JSPWiki usa Jakarta Log4j para el logging. Por favor indica a JSPWiki dónde deberían ir los ficheros de log. -install.jsp.adv.settings.workdir.label=Directorio de trabajo -install.jsp.adv.settings.workdir.desc=Este es el sitio dónde todas las cachés y otras cosas calculadas en tiempo de ejecución son guardadas. -install.jsp.instr.desc=Una vez hagas click en <em>&#161;Configura!</em>, el instalador escribirá tus preferencias en <code>{0}</code>. También creará una cuenta de Administrador con una contraseña por defecto y el correspondiente wiki-grupo Admin. -install.jsp.instr.submit=&#161;Configura! -install.jsp.validated.new.props=Aquí está tu nuevo jspwiki.properties # Installer.java install.installer.unable.read.props=Incapaz de leer las propiedades: {0} install.installer.default.appname=MiWiki @@ -236,3 +215,15 @@ preview=Previsualizar #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit. cancel=Cancelar +#Formerly named install.jsp.instr.submit. +org.apache.wiki.action.InstallActionBean.save=&#161;Configura! +#Formerly named install.jsp.basics.appname.label.. Formerly named applicationName. +properties.jspwiki.jspwiki_applicationName=Nombre de la Aplicación +#Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL. +properties.jspwiki.jspwiki_baseURL=URL base +#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir. +properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Almacenamiento de páginas +#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile. +properties.log4j.log4j_appender_FileLog_File=Ficheros de log +#Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir. +properties.jspwiki.jspwiki_workDir=Directorio de trabajo Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties?rev=811988&r1=811987&r2=811988&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties (original) +++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties Mon Sep 7 03:35:09 2009 @@ -1,6 +1,6 @@ -# + # JSPWiki - a JSP-based WikiWiki clone. -# + # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -8,18 +8,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# + # http://www.apache.org/licenses/LICENSE-2.0 -# + # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. -# +# under the License. + ############################################################################ -# + # This is the main i18n resource file for JSPWiki internal # code, the so-called core code. @@ -109,29 +109,11 @@ install.installer.validate.logdir=Sinun on määriteltävä hakemisto lokeille. install.installer.validate.pagedir=Sinun on määriteltävä hakemisto, minne sivut ja liitteet tallennetaan. install.installer.validate.workdir=Sinun on määriteltävä työhakemisto. -install.jsp.adv.settings.logfile.desc=Mihin hakemistoon logitiedostot tulisi sijoittaa? -install.jsp.adv.settings.logfile.label=Lokitiedostot -install.jsp.adv.settings.title=Edistyneemmät asetukset -install.jsp.adv.settings.workdir.desc=Tämä on hakemisto, jonne välimuistit ja muut väliaikaiset tiedostot sijoitetaan. -install.jsp.adv.settings.workdir.label=Työhakemisto -install.jsp.basics.appname.desc=Mikä wikisi nimeksi tulee? Nimen kannattaa olla melko lyhyt. -install.jsp.basics.appname.label=Sovelluksen nimi -install.jsp.basics.baseurl.desc=Ole hyvä, ja kerro, mikä URL wikille tulee. -install.jsp.basics.baseurl.label=Perus-URL -install.jsp.basics.page.storage.desc=JSPWiki tallentaa wikisivut ja liitetiedostot oletuksena tähän hakemistoon. Jos hakemistoa ei ole olemassa, se luodaan. -install.jsp.basics.page.storage.label=Tallennushakemisto -install.jsp.basics.title=Perusasiat install.jsp.install.error=En voinut tallentaa asetuksia: install.jsp.install.info=Hyviä uutisia install.jsp.install.msg.admin.notexists=Onko tämä ensimmäinen kerta kun ajat asennusohjelmaa? Jos kyllä, sinun on syytä tietää, että kunhan JSPWiki on tarkistanut ja tallentanut asetuksesi, tarvitset ylläpitäjän oikeudet päästäksesi tähän asennusohjelmaan käsiksi uudelleen. Tällä estetään se, että satunnaiset ihmiset eivät riko wikiäsi. install.jsp.install.msg.rnd.pwd=Koska ylläpitäjän tunnusta ei ollut vielä olemassa, JSPWiki loi sinulle sellaisen. Voit vaihtaa tämän salasanan myöhemmin, tietenkin. Ylläpitäjän tunnus on {0} ja salasana on {1}. Ole hyvä, ja kirjoita nämä ylös, ja pidä varmassa paikassa. JSPWiki loi myös wikiryhmän, jonka nimi on {2}, jossa tämä käyttäjä on. install.jsp.install.warning=Varoitus: -install.jsp.instr.desc=Kun klikkaat <em>Luo asetukset!</em>, asennusohjelma kirjoittaa asetuksesi tiedostoon <code>{0}</code>. Se luo myös ylläpitäjän tunnuksen ja sille salasanan, sekä myös ylläpitäjien oman ryhmän. -install.jsp.instr.submit=Luo asetukset! -install.jsp.intro.p1=Tervetuloa! Tämä sivu auttaa sinua JSPWikin asennuksen hankalien vaiheiden ohittamisessa. Jos näet tämän sivun, olet jo onnistuneesti tehnyt ensimmäiset asetukset oikein saadaksesi JSPWikin toimimaan servlet-ympäristössäsi. -install.jsp.intro.p2=Seuraavaksi sinun on tehtävä joitain asetuksia. Kun painat Luo asetukset, asennuspaketissa ollut <code>jspwiki.properties</code> muutetaan tekemiesi asetusten mukaisesti, tai jos sitä ei löydy, luodaan uusi. -install.jsp.intro.p3=Tämä asennusohjelma on tarkoitettu lähinnä niille, jotka vain haluavat päästä nopeasti liikkeelle. Jos haluat asentaa JSPWikin osaksi olemassaolevaa järjestelmääsi, sinun kannattaa muokata <code>jspwiki.properties</code> -tiedostoa suoraan. Löydät esimerkkitiedoston hakemistosta <code>wikihakemisto/WEB-INF/</code>. -install.jsp.intro.title=JSPWikin asennusohjelma install.jsp.security.admaccount.enabled=Olemassa install.jsp.security.admaccount.enabled.desc=Tälle wikille on luotu ylläpitäjän tunnus nimeltä <strong>admin</strong>, joka kuuluu ryhmään <strong>Admin</strong>. JSPWikin oletusturvamalli antaa tämän ryhmän jäsenille kaikkivoivan <code>AllPermission</code> -luvan jspwiki.policy-tiedostossa.. install.jsp.security.admaccount.label=Ylläpitäjän tunnus @@ -142,8 +124,6 @@ install.jsp.security.sec.conf.opt1=JAAS ja servlet-alustan turvajärjestelmä (oletus) install.jsp.security.sec.conf.opt2=Servlet-alustan turvajärjestelmä install.jsp.security.title=Turvajärjestelmä -install.jsp.title=JSPWikin asennusohjelma -install.jsp.validated.new.props=Tässä uusi jspwiki.properties -tiedostosi. # Captcha.jsp captcha.asirra.adopt.me=Adoptoi minut @@ -224,3 +204,15 @@ preview=Esikatsele #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit. cancel=Peruuta +#Formerly named install.jsp.instr.submit. +org.apache.wiki.action.InstallActionBean.save=Luo asetukset! +#Formerly named install.jsp.basics.appname.label.. Formerly named applicationName. +properties.jspwiki.jspwiki_applicationName=Sovelluksen nimi +#Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL. +properties.jspwiki.jspwiki_baseURL=Perus-URL +#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir. +properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Tallennushakemisto +#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile. +properties.log4j.log4j_appender_FileLog_File=Lokitiedostot +#Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir. +properties.jspwiki.jspwiki_workDir=Työhakemisto Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties?rev=811988&r1=811987&r2=811988&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties (original) +++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties Mon Sep 7 03:35:09 2009 @@ -1,6 +1,6 @@ -# + # JSPWiki - a JSP-based WikiWiki clone. -# + # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -8,18 +8,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# + # http://www.apache.org/licenses/LICENSE-2.0 -# + # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. -# +# under the License. + ############################################################################ -# + # This is the main french-translation resource file for JSPWiki internal code, # the so-called core code. # Ceci est la traduction franÁaise du fichier de ressources principal pour le code @@ -119,24 +119,11 @@ captcha.asirra.a.get.challenge=Obtenir différentes images. captcha.asirra.a.whatsthis=Qu'est-ce donc ? captcha.submit=Soumettre -# Install.jsp -install.jsp.title=Installeur JSPWiki -install.jsp.intro.title=Installeur JSPWiki -install.jsp.intro.p1=Bienvenue ! Cette petite page JSP est lô pour vous aider dans la première étape délicate de l'installation de JSPWiki. Si vous voyez cette page, c'est que vous avez déjô installé correctement JSPWiki dans votre conteneur Web. -install.jsp.intro.p2=Maintenant, il y a deux ou trois choses que vous devez configurer. En pressant Soumettre, le fichier <code>jspwiki.properties</code> de la distribution sera modifié ; s'il est introuvable, un nouveau fichier sera créé. -install.jsp.intro.p3=Ce système de configurationest vraiment conçu pour les personnesqui veulent juste pouvoir démarrer très vite. Si vous vuolez intégrer JSPWiki à un système existant, je vous recommande d'aller éditerle fichier <code>jspwiki.properties</code> directement.Vous trouverez un fichier de configuration d'exemple dans le répertoire <code>yourwiki/WEB-INF/</code>. install.jsp.install.info=Bonne nouvelle : install.jsp.install.warning=Attention : install.jsp.install.error=Impossible d'enregistrer la configuration : install.jsp.install.msg.rnd.pwd=Comme aucun compte d'administrateur n''existe encore, JSPWiki en a créé un pour vous, avec un mot de passe généré aléatoirement. Vous pourrez le modifier plus tard, bien sûr. L'identifiant de compte est {0} et le mot de passe est {1}. Veillez ? conserver cette information dans un endroit sër et caché. JSPWiki a également créé un groupe wiki nommé {2}, auquel appartient cet utilisateur. install.jsp.install.msg.admin.notexists=C'est la première fois que vous lancez l'installeur ? Dans ce cas, vous devez savoir que lorsque JSPWiki aura validé et enregistré votre configuration pour la première fois, vous aurez besoin de privilèges d'administration pour ouvrir à nouveau cette page. Nous ne faisons cela que pour éviter que des personnes mal intentinonées puissent détériorervotre Wiki. -install.jsp.basics.title=Général -install.jsp.basics.appname.label=Nom de l'application -install.jsp.basics.appname.desc=Comment s'appellera votre Wiki ? Pensez à un nom plutÙt court. -install.jsp.basics.baseurl.label=URL de base -install.jsp.basics.baseurl.desc=Veuillez préciser à JSPWiki où votre Wiki sera localisé sur le Web. -install.jsp.basics.page.storage.label=Stockage des pages -install.jsp.basics.page.storage.desc=Par défaut, JSPWiki utilise son VersioningFileProvider qui stocke les fichiers dans un répertoire particulier de votre disque dur. Si vous indiquez un répertoire qui n'existe pas, JSPWiki le créera pour vous. Tous les attachements seront également mis dans ce répertoire. install.jsp.security.title=Sécurité install.jsp.security.sec.conf.label=Configuration de sécurité install.jsp.security.sec.conf.opt1=JAAS et sécurité du conteneur (défaut) @@ -147,14 +134,6 @@ install.jsp.security.admaccount.notenabled=Désactivé install.jsp.security.admaccount.enabled.desc=Ce Wiki a un compte administrateur nommé <strong>admin</strong> qui fait partie du groupe Wiki <strong>Admin</strong>. Par défaut, la politique de sécurité de JSPWiki accorde à tous les membres du groupe Admin l'omnipotent <code>AllPermission</code>. install.jsp.security.admaccount.notenabled.desc=Ce Wiki ne semble pas avoir de compte administrateur. Quand vous cliquerez sur <em>Configurer</em>, JSPWiki en créera un pour vous. -install.jsp.adv.settings.title=Avancé -install.jsp.adv.settings.logfile.label=Fichiers de journalisation -install.jsp.adv.settings.logfile.desc=JSPWiki utilise Jakarta Log4j pour la journalisation. Veuillez indiquer à JSPWiki où ces fichiers doit se trouver. -install.jsp.adv.settings.workdir.label=Répertoire de travail -install.jsp.adv.settings.workdir.desc=Voici l'endroit où tous les caches et tout les fichiers temporaires d'exécution sont stockés. -install.jsp.instr.desc=Quand vous cliquerez sur <em>Configurer</em>, l''installeur enregistrera vos paramètres dans <code>{0}</code>. Il créera également un compte Administrateur avec un mot de passe généré aléatoirement, et un groupe Admin correspondant. -install.jsp.instr.submit=Configurer -install.jsp.validated.new.props=Voici votre nouveau jspwiki.properties # Installer.java install.installer.unable.read.props=Impossible de lire les propriétés : {0} install.installer.default.appname=MonWiki @@ -237,4 +216,16 @@ preview=Aperçu #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit. cancel=Abandonner +#Formerly named install.jsp.instr.submit. +org.apache.wiki.action.InstallActionBean.save=Configurer +#Formerly named install.jsp.basics.appname.label.. Formerly named applicationName. +properties.jspwiki.jspwiki_applicationName=Nom de l'application +#Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL. +properties.jspwiki.jspwiki_baseURL=URL de base +#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir. +properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Stockage des pages +#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile. +properties.log4j.log4j_appender_FileLog_File=Fichiers de journalisation +#Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir. +properties.jspwiki.jspwiki_workDir=Répertoire de travail #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.title. Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties?rev=811988&r1=811987&r2=811988&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties (original) +++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties Mon Sep 7 03:35:09 2009 @@ -1,6 +1,6 @@ -# + # JSPWiki - a JSP-based WikiWiki clone. -# + # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -8,18 +8,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# + # http://www.apache.org/licenses/LICENSE-2.0 -# + # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. -# +# under the License. + ############################################################################ -# + # This is the main i18n resource file for JSPWiki internal # code, the so-called core code. @@ -116,25 +116,12 @@ captcha.asirra.a.get.challenge=Richiedi una nuova immagine. captcha.asirra.a.whatsthis=Cos'&egrave; questo? captcha.submit=Submit -# Install.jsp -install.jsp.title=JSPWiki Installer -install.jsp.intro.title=JSPWiki Installer -install.jsp.intro.p1=Benvenuti! Questa semplice pagina JSP serve ad aiutare a completare il primo passo dell'istallazione .=Se potete vedere questa pagina, avete istallato correttamente JSPWiki nel container web. -install.jsp.intro.p2=Ora ci sono alcune cose che occorre configurare. Quando premerete il bottone invia, il file <code>jspwiki.properties</code> contenuto nella distribuzione standard ver&agrave; modificato, o, se non potesseessere trovato, ne verr&agrave; creato uno nuovo. -install.jsp.intro.p3=Questo sistema di setup &egrave; pensato per chi vuole avere un sistema funzionante velocemente. Se volete integrare JSPWiki in un sistema esistente, vi raccomandiamo di modificare il file<code>jspwiki.properties</code> direttamente. Potete trovare una configurazione di esempio sotto:<code>yourwiki/WEB-INF/</code>. install.jsp.install.info=Buone notizie: install.jsp.install.warning=Attenzione: install.jsp.install.error=Impossibile salvare la configurazione: install.jsp.install.msg.rnd.pwd=Siccome non esiste ancora un account di amministrazione, JSPWiki ne ha creato uno, conpassword casuale. Potete cambiare questa password pi&ugrave; tardi. L'identificativo di questo account &grave;{0} e la password &egrave;{1}. Per favore, annotate questa informazione e tenetela in un posto sicuro. JSPWiki ha anche creato un gruppo wiki chiamato {2} che contiene questo utente. install.jsp.install.msg.admin.notexists=E' la prima volta che avete eseguito questo installer? Se si, dovete sapere chedopo che JSPWiki ha validato e salvato la vostra configurazione la prima volta, avretebisogno dei privilegi di amministratore per accedere ancora a questa pagina. Lo facciamo per evitare che persone non autorizzate possano compiere atti non voluti sul vostro wiki. -install.jsp.basics.title=Elementi base -install.jsp.basics.appname.label=Nome dell' Applicazione -install.jsp.basics.appname.desc=Come deve chiamarsi il vostro wiki? Vi conviene dare un nome relativamente corto. -install.jsp.basics.baseurl.label=Base URL -install.jsp.basics.baseurl.desc=Per favore, segnalate a JSPWiki dove &egrave; istallato il vostro wiki. -install.jsp.basics.page.storage.label=Memorizzazione delle pagine -install.jsp.basics.page.storage.desc=Per default, JSPWiki user&agrave; un VersioningFileProvider che mantiene i file in una specifica directory sul vostro disco. Se specificate una directory che non esiste, JSPWiki lacreer&agrave; automaticamente. Tutti gli allegati verranno messi nella stessa directory. install.jsp.security.title=Sicurezza install.jsp.security.sec.conf.label=Configurazione della Sicurezza install.jsp.security.sec.conf.opt1=Sicurezza basata su JAAS e sul container (default) @@ -145,14 +132,6 @@ install.jsp.security.admaccount.notenabled=Non abilitato install.jsp.security.admaccount.enabled.desc=Questo wiki ha un account di amministratore con identificativo <strong>admin</strong> che f&agrave; parte del gruppo wiki <strong>Admin</strong>. Per default, JSPWiki assegna a tutti i membri del gruppo Admin group il permesso <code>AllPermission</code> che permette di fare qualsiasi cosa. install.jsp.security.admaccount.notenabled.desc=Questo wiki non sembra avere un account di administratore. Se selezionate<em>Configura!</em>,JSPWiki ne creer&agrave; uno. -install.jsp.adv.settings.title=Opzioni avanzate -install.jsp.adv.settings.logfile.label=File di Log -install.jsp.adv.settings.logfile.desc=JSPWiki usa Jakarta Log4j per il logging. Per favore, definite dove devono essere salvati i file di log. -install.jsp.adv.settings.workdir.label=Directory di lavoro -install.jsp.adv.settings.workdir.desc=Questo &egrave; il posto dove vengono mantenute le caches e altro materiale runtime. -install.jsp.instr.desc=Dopo che avrete selezionato <em>Configura!</em>, l' installer scriver&agrave; i setting ottenuti in: <code>{0}</code>. Verr&agrave; anche creato un account di Amministratore con una password casuale e un corrispondente gruppo Admin. -install.jsp.instr.submit=Configura! -install.jsp.validated.new.props=Ecco il vostro nuovo file jspwiki.properties # Installer.java install.installer.unable.read.props=Impossiblie leggere le propriet&agrave: {0} install.installer.default.appname=MyWiki @@ -235,4 +214,16 @@ preview=Anteprima #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit. cancel=Annulla +#Formerly named install.jsp.instr.submit. +org.apache.wiki.action.InstallActionBean.save=Configura! +#Formerly named install.jsp.basics.appname.label.. Formerly named applicationName. +properties.jspwiki.jspwiki_applicationName=Nome dell' Applicazione +#Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL. +properties.jspwiki.jspwiki_baseURL=Base URL +#Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir. +properties.jspwiki.jspwiki_fileSystemProvider_pageDir=Memorizzazione delle pagine +#Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile. +properties.log4j.log4j_appender_FileLog_File=File di Log +#Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir. +properties.jspwiki.jspwiki_workDir=Directory di lavoro #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.title. Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties?rev=811988&r1=811987&r2=811988&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties (original) +++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties Mon Sep 7 03:35:09 2009 @@ -1,6 +1,6 @@ -# + # JSPWiki - a JSP-based WikiWiki clone. -# + # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -8,18 +8,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# + # http://www.apache.org/licenses/LICENSE-2.0 -# + # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. -# +# under the License. + ############################################################################ -# + # This is the main i18n resource file for JSPWiki internal # code, the so-called core code. @@ -115,24 +115,11 @@ captcha.asirra.a.get.challenge=Vraag andere plaatjes captcha.asirra.a.whatsthis=Wat is dit ? captcha.submit=Submit -# Install.jsp -install.jsp.title=JSPWiki Installer -install.jsp.intro.title=JSPWiki Installer -install.jsp.intro.p1=Welkom! Deze kleine JSP helpt je door de eerste moeilijke fase van JSPWiki installatie. Als je deze pagina ziet, dan heb je JSPWiki al correct geinstalleerd in je (web)container. -install.jsp.intro.p2=Er zijn een aantal dingen die je moet configureren. Als je Configureer klikt , zal de standaard <code>jspwiki.properties</code> file worden
{'source': 'Apache Software Foundation Public Mail Archives'}