You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/06/03 13:48:16 UTC
svn commit: r1488962 - in /incubator/jspwiki/trunk: ./ jspwiki-war/
jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/resources/
jspwiki-war/src/main/resources/plugin/
jspwiki-war/src/main/resources/templates/ jspwiki-war/src/test/java/or...
Author: gmazza
Date: Mon Jun 3 11:48:15 2013
New Revision: 1488962
URL: http://svn.apache.org/r1488962
Log:
Removed unused resource strings, made TranslationsCheck less chatty.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/jspwiki-war/build.xml
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_de.properties
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_it.properties
incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties
incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TranslationsCheck.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1488962&r1=1488961&r2=1488962&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Jun 3 11:48:15 2013
@@ -1,3 +1,14 @@
+2013-06-03 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-4
+
+ * Removed further webtest-related configuration from jspwiki-war/build.xml;
+ updated parameters so ant dist still works.
+
+ * Updated o.a.w.TranslationsCheck to make less chatty
+
+ * Removed unused translations from Italian and German resource files.
+
2013-06-02 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.0-svn-3
Modified: incubator/jspwiki/trunk/jspwiki-war/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/build.xml?rev=1488962&r1=1488961&r2=1488962&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/build.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/build.xml Mon Jun 3 11:48:15 2013
@@ -24,8 +24,8 @@
To build:
1.) run mvn clean install from Maven, which runs all unit
tests and builds the WAR.
- 2.) from Ant, run the webtests (Selenium tests) or dist
- targets (to create the full distribution).
+ 2.) run mvn javadoc:javadoc to build the Javadocs in target/site
+ 3.) from Ant, run the dist target (to create the full distribution).
-->
<project name="JSPWiki" default="war" basedir=".">
@@ -41,11 +41,6 @@
<property name="release.dir" value="target/ant-dist/releases" />
<property name="install.fulldir" value="${tmpdir}/install" />
- <!-- dirs holding libs -->
- <property name="libs.main" value="target/JSPWiki/WEB-INF/lib" />
-
- <property name="central.url" value="http://repo.maven.apache.org/maven2" />
-
<!-- The directory where the SVN sources are checked out. -->
<property name="install.src" value="${tmpdir}/svnsrc" />
@@ -55,65 +50,9 @@
<property name="svn.repository" value="http://svn.apache.org/repos/asf/incubator/jspwiki" />
<property name="svn.tag" value="trunk" />
- <!-- The path used for running tests. We add the tests/etc directory
- to the base path defined above, since we put all the relevant
- .properties-files in tests/etc. -->
- <path id="path.tests">
- <pathelement location="${java.home}/../lib/tools.jar" />
- <fileset dir="${libs.main}">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${webtests.libs}">
- <include name="*.jar" />
- </fileset>
- <pathelement path="target/test-classes" />
- </path>
-
<!-- The prefix to use when reading environment variables -->
<property environment="env" />
-
- <!-- ============================================================== -->
-
- <!-- Initialising, cleaning, etc. -->
-
- <target name="init"
- description="Initializes everything, creates directories, etc.">
- <mkdir dir="${webtests.libs}" />
- <download-deps />
- </target>
-
- <target name="test-file-exists">
- <echo message="Testing for ${download-to-file}" level="debug"/>
- <available file="${download-to-file}" property="exists" />
- </target>
-
- <target name="download-lib" unless="exists" depends="test-file-exists">
- <get src="${download-url}" dest="${download-to-file}" />
- </target>
-
- <macrodef name="get-element">
- <attribute name="to-file" />
- <attribute name="url" />
- <sequential>
- <antcall target="download-lib">
- <param name="download-to-file" value="@{to-file}"/>
- <param name="download-url" value="@{url}" />
- </antcall>
- </sequential>
- </macrodef>
-
- <macrodef name="download-deps">
- <sequential>
- <!-- Dependencies used by webtests task -->
- <get-element to-file="${webtests.libs}/selenium-server-standalone-2.25.0.jar"
- url="http://selenium.googlecode.com/files/selenium-server-standalone-2.25.0.jar" />
- <get-element to-file="${webtests.libs}/jetty-all-7.6.7.v20120910.jar"
- url="${central.url}/org/eclipse/jetty/aggregate/jetty-all/7.6.7.v20120910/jetty-all-7.6.7.v20120910.jar" />
- <get-element to-file="${webtests.libs}/hsqldb-1.8.0.10.jar" url="${central.url}/org/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar" />
- </sequential>
- </macrodef>
-
<!-- ============================================================== -->
<!-- Installation targets -->
@@ -245,7 +184,7 @@
<zip zipfile="${install.fulldir}/${ant.project.name}-doc.zip">
<zipfileset dir="src/main/config/doc" prefix="doc" />
- <zipfileset dir="target/apidocs" prefix="javadoc" />
+ <zipfileset dir="target/site/apidocs" prefix="javadoc" />
<zipfileset dir="src/main/config/wikipages" prefix="wikipages" excludes="**/.??*" />
</zip>
</target>
@@ -269,13 +208,13 @@
description="Builds the entire distribution artifacts without checksums and signatures.">
<!-- binary distribution -->
- <copy file="ChangeLog" todir="${install.fulldir}" />
- <copy file="DISCLAIMER" todir="${install.fulldir}" />
- <copy file="LICENSE" todir="${install.fulldir}" />
- <copy file="NOTICE" todir="${install.fulldir}" />
- <copy file="README" todir="${install.fulldir}" />
- <copy file="ReleaseNotes" todir="${install.fulldir}" />
- <copy file="UPGRADING" todir="${install.fulldir}" />
+ <copy file="../ChangeLog" todir="${install.fulldir}" />
+ <copy file="../DISCLAIMER" todir="${install.fulldir}" />
+ <copy file="../LICENSE" todir="${install.fulldir}" />
+ <copy file="../NOTICE" todir="${install.fulldir}" />
+ <copy file="../README" todir="${install.fulldir}" />
+ <copy file="../ReleaseNotes" todir="${install.fulldir}" />
+ <copy file="../UPGRADING" todir="${install.fulldir}" />
<copy file="target/JSPWiki.war" todir="${install.fulldir}" />
<zip zipfile="${release.dir}/${ant.project.name}-${jspwiki.version}-bin.zip">
<zipfileset dir="${install.fulldir}" prefix="${ant.project.name}-bin" />
@@ -326,34 +265,6 @@
<!-- ============================================================== -->
- <!-- Running tests -->
-
- <target name="tests-init" depends="init">
-
- <!-- Create web.xml files for testing -->
- <copy file="src/main/webapp/WEB-INF/web.xml" tofile="${webtests.build}/webtest.web.xml" overwrite="true" />
-
- <!-- For web unit tests, turn off SSL (self-signed certs b0rk
- the tests) and enable JDBC refs -->
- <replace file="${webtests.build}/webtest.web.xml"
- token="CONFIDENTIAL" value="NONE" />
- <replace file="${webtests.build}/webtest.web.xml"
- token="<!-- REMOVE ME TO ENABLE JDBC DATABASE" value="" />
- <replace file="${webtests.build}/webtest.web.xml"
- token="REMOVE ME TO ENABLE JDBC DATABASE -->" value="" />
-
- <!-- For unit testing and some webtests, turn on container auth -->
- <copy file="${webtests.build}/webtest.web.xml"
- tofile="${webtests.build}/containerauth.web.xml" overwrite="true" />
- <replace file="${webtests.build}/containerauth.web.xml"
- token="<!-- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH" value="" />
- <replace file="${webtests.build}/containerauth.web.xml"
- token="REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH -->" value="" />
-
- </target>
-
- <!-- ============================================================== -->
-
<!-- Targets for signing JAR files -->
<!-- These targets collectively create a Java keystore for signing,
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1488962&r1=1488961&r2=1488962&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Mon Jun 3 11:48:15 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "3";
+ public static final String BUILD = "4";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties?rev=1488962&r1=1488961&r2=1488962&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties Mon Jun 3 11:48:15 2013
@@ -234,18 +234,3 @@ varmgr.authenticated=authentifiziert
varmgr.asserted=angenommene Identität
varmgr.anonymous=anonym
-# Outdated or superfluous properties
-
-# folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten
-# Je nach Verwendung der vorliegenden Datei werden sie aber unter Umständen weiterhin benötigt.
-# Daher ist es sinnvoll, sie in diese spezielle Sektion zu verschieben.
-
-# mindestens seit Version 2.6.1-cvs-7
-lostpwd.reset.clickhere=Klicke hier
-lostpwd.reset.login={0} um dich anzumelden, sobald du dein neues Passwort erhalten hast.
-
-# mindestens seit Version 2.6.1-rc-4
-login.error.capslock=Ungültige Anmeldung! Ist eventuell die Feststelltaste (Groß-/Kleinschreibung) aktiviert?
-
-# seit Version 2.7.0-alpha-34
-comment.by=Kommentar von {0}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_de.properties?rev=1488962&r1=1488961&r2=1488962&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_de.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_de.properties Mon Jun 3 11:48:15 2013
@@ -89,11 +89,3 @@ plugin.listlocks.acquired=gesperrt ab
plugin.listlocks.expires=gesperrt bis
plugin.listlocks.no.locks.exist=Momentan existieren keine Sperren.
-# InsertPage plugin
-plugin.insert.notfound=Seite konnte nicht gefunden werden!
-plugin.insert.recursion=Fehler: Zyklische Referenz - Du kannst eine Seite nicht in sie selbst einfügen!
-plugin.insert.nopermission=Du hast keine ausreichenden Rechte, um diese Seite zu sehen.
-plugin.insert.nopage1=Es gibt keine Seite namens
-plugin.insert.nopage2=Willst du sie
-plugin.insert.nopage3=erstellen?
-plugin.insert.definepage=Du musst eine Seite definieren!
\ No newline at end of file
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_it.properties?rev=1488962&r1=1488961&r2=1488962&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_it.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/plugin/PluginResources_it.properties Mon Jun 3 11:48:15 2013
@@ -72,11 +72,4 @@ plugin.listlocks.acquired=Aquisiti
plugin.listlocks.expires=Scade il
plugin.listlocks.no.locks.exist=In questo momento non esitono blocchi.
-# InsertPage plugin
-plugin.insert.notfound=La pagina non è stata trovata.
-plugin.insert.recursion=Errore: Riferimento Circolare - non ` possibile includere una pagina dentro s` stessa!
-plugin.insert.nopermission=Non avete i permessi per visualizzare questa pagina inclusa.
-plugin.insert.nopage1=Non esiste una pagina chiamata
-plugin.insert.nopage2=Vorreste
-plugin.insert.nopage3=crearla?
-plugin.insert.definepage=Dovete definire una pagina!
\ No newline at end of file
+
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties?rev=1488962&r1=1488961&r2=1488962&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties Mon Jun 3 11:48:15 2013
@@ -666,26 +666,4 @@ javascript.tip.default.title=Weitere...
javascript.prefs.areyousure=Wenn du nicht auf 'Benutzereinstellungen speichern' klickst, \
werden deine Einstellungen verworfen. Bist du sicher, dass diese Seite verlassen werden soll?
-# Outdated or superfluous properties
-# folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten
-# Je nach Verwendung der vorliegenden Datei werden sie aber unter Umständen weiterhin benötigt.
-# Daher ist es sinnvoll, sie in diese spezielle Sektion zu verschieben.
-
-# seit v2.7.0-svn-4
-javascript.quick.top=Gehe zum Seitenanfang
-javascript.quick.previous=Gehe zum vorherigen Abschnitt
-javascript.quick.next=Gehe zum nächsten Abschnitt
-javascript.quick.bottom=Gehe zum Seitenende
-info.delete.attachmentwarning=<i>Bitte erst alle Anhänge löschen, bevor diese Seite gelöscht werden kann.</i>
-# seit v2.7.0-svn-41
-editor.plain.editassist=Bearbeitungsassistent
-editor.plain.editassist.title=Bearbeitungsassistent ein-/ausblenden
-# seit v2.7.0-svn-45
-info.rsspagefeed.title=RSS-Feed für die Seite {0}
-# seit v2.7.0-svn-49
-group.areyousure=Soll die Gruppe {0} wirklich dauerhaft gelöscht werden? Benutzer können dann unter Umständen auf \
- Seiten, deren Zugangsberechtigungslisten (ACLs) diese Gruppe enthalten, nicht mehr zugreifen.\\n\\n \
- Wenn du auf OK klickst, wird diese Gruppe sofort gelöscht!
-# seit v2.7.0-alpha-12
-prefs.user.editorareaheight=Höhe des Editorbereichs
\ No newline at end of file
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TranslationsCheck.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TranslationsCheck.java?rev=1488962&r1=1488961&r2=1488962&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TranslationsCheck.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TranslationsCheck.java Mon Jun 3 11:48:15 2013
@@ -118,15 +118,9 @@ public class TranslationsCheck
Properties p2 = new Properties();
p2.load(new FileInputStream(new File(base + source2)));
- String msg = "Properties in file " + source2;
+ String msg = "Checking " + source2 + "...";
System.out.println(msg);
- StringBuffer sb = new StringBuffer(msg.length());
- for (int i = 0; i < msg.length(); i++)
- sb.append("-");
- System.out.println(sb.toString());
-
- System.out.println("Missing:");
- System.out.println("--------");
+
Iterator< String > iter = sortedNames(p1).iterator();
while (iter.hasNext())
{
@@ -136,13 +130,19 @@ public class TranslationsCheck
if (p2.get(name) == null)
{
missing++;
+ if (missing == 1)
+ {
+ System.out.println("\nMissing:");
+ System.out.println("--------");
+ }
System.out.println(name + " = " + value);
}
}
- System.out.println();
+ if (missing > 0)
+ {
+ System.out.println();
+ }
- System.out.println("Outdated or superfluous:");
- System.out.println("------------------------");
iter = sortedNames(p2).iterator();
while (iter.hasNext())
{
@@ -152,10 +152,19 @@ public class TranslationsCheck
if (p1.get(name) == null)
{
outdated++;
+ if (outdated == 1)
+ {
+ System.out.println("\nOutdated or superfluous:");
+ System.out.println("------------------------");
+ }
System.out.println(name + " = " + value);
}
}
- System.out.println();
+ if (outdated > 0)
+ {
+ System.out.println();
+ }
+
Map< String, Integer > diff = new HashMap< String, Integer >( 2 );
diff.put( "missing", missing );
diff.put( "outdated", outdated );