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/04/29 16:08:54 UTC
svn commit: r1477087 - in /incubator/jspwiki/trunk: ./ .settings/ etc/i18n/
etc/i18n/plugin/ etc/i18n/templates/ src/main/java/org/apache/wiki/
src/main/java/org/apache/wiki/filters/
src/main/java/org/apache/wiki/plugin/ src/main/resources/ src/main/re...
Author: gmazza
Date: Mon Apr 29 14:08:53 2013
New Revision: 1477087
URL: http://svn.apache.org/r1477087
Log:
Moved i18n resources to Maven standard directory location (src/main/resources)
Added:
incubator/jspwiki/trunk/src/main/resources/CoreResources.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_de.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_es.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_fi.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_fr.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_it.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_nl.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_pt_BR.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_pt_BR.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_ru.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties
incubator/jspwiki/trunk/src/main/resources/CoreResources_zh_CN.properties
- copied unchanged from r1476951, incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties
incubator/jspwiki/trunk/src/main/resources/org/
incubator/jspwiki/trunk/src/main/resources/org/apache/
incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/
incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/filters/
incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/filters/profanity.properties
incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/plugin/
incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/plugin/denounce.properties
incubator/jspwiki/trunk/src/main/resources/plugin/
- copied from r1476951, incubator/jspwiki/trunk/etc/i18n/plugin/
incubator/jspwiki/trunk/src/main/resources/templates/
- copied from r1476951, incubator/jspwiki/trunk/etc/i18n/templates/
Removed:
incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_pt_BR.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties
incubator/jspwiki/trunk/etc/i18n/plugin/
incubator/jspwiki/trunk/etc/i18n/templates/
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/filters/profanity.properties
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/plugin/denounce.properties
incubator/jspwiki/trunk/src/webdocs/scripts/fckeditor/
Modified:
incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/pom.xml
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
Modified: incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs?rev=1477087&r1=1477086&r2=1477087&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs Mon Apr 29 14:08:53 2013
@@ -1,6 +1,5 @@
-#Sat Nov 08 19:15:42 EET 2008
eclipse.preferences.version=1
-encoding//etc/i18n/templates/default_de.properties=ISO-8859-1
+encoding//src/main/resources/templates/default_de.properties=ISO-8859-1
encoding//src/wikipages/fi/ApprovalRequiredForPageChanges.txt=UTF-8
encoding//src/wikipages/fi/ApprovalRequiredForUserProfiles.txt=UTF-8
encoding//src/wikipages/fi/EditFindAndReplaceHelp.txt=UTF-8
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1477087&r1=1477086&r2=1477087&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Apr 29 14:08:53 2013
@@ -1,3 +1,11 @@
+2013-04-29 Glen Mazza (glenmazza AT apache DOT org)
+
+ * 2.9.1-incubating-5
+
+ * Moved i18n resource files to Mavenized location.
+
+ * Updated build.xml and pom.xml for new i18n source locations
+
2013-04-25 Glen Mazza (glenmazza AT apache DOT org)
* 2.9.1-incubating-4
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1477087&r1=1477086&r2=1477087&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Mon Apr 29 14:08:53 2013
@@ -82,7 +82,8 @@
<property name="code.build" value ="build" />
<!-- The internationalization strings for the core JSPWiki classes -->
- <property name="code.i18n" value="etc/i18n" />
+ <property name="code.i18n" value="src/main/resources" />
+
<!-- The i18n location in which 18n templates are created -->
<property name="tmplt.i18n.dir" value="i18n_templates" />
@@ -311,9 +312,9 @@
<delete dir="${docs.javadoc}" />
<delete dir="${doc.rat}" />
<delete file="etc/jspwiki.properties" />
- <delete file="etc/i18n/CoreResources_en.properties" />
- <delete file="etc/i18n/plugin/PluginResources_en.properties" />
- <delete file="etc/i18n/templates/default_en.properties" />
+ <delete file="${code.i18n}/CoreResources_en.properties" />
+ <delete file="${code.i18n}/plugin/PluginResources_en.properties" />
+ <delete file="${code.i18n}/templates/default_en.properties" />
<delete file="tests/etc/groupdatabase.xml" />
<delete file="tests/etc/userdatabase.xml" />
<delete file="tests/etc/jspwiki.properties" />
@@ -422,17 +423,17 @@
<!-- Builds the jar of all compiled class files -->
<target name="buildjar" unless="check_jar_has_been_built">
- <!-- This is unfortunately needed, since the default property files are not otherwise
- used. FIXME: Figure out a better way to do this in the future. -->
+ <!-- Creating a specific _en file presently needed just so that "English" will appear as an option on
+ the User Preferences page, language option (and similar issues). FIXME: change JSP code
+ so this is no longer necessary.
+ -->
<copy file="${code.i18n}/CoreResources.properties" tofile="${code.i18n}/CoreResources_en.properties"/>
<copy file="${code.i18n}/templates/default.properties" tofile="${code.i18n}/templates/default_en.properties"/>
<copy file="${code.i18n}/plugin/PluginResources.properties" tofile="${code.i18n}/plugin/PluginResources_en.properties"/>
<jar jarfile="${jarfile}">
<fileset dir="${code.build}" includes="**/*.class" />
- <fileset dir="${code.src}" includes="org/**/*.properties" />
<fileset dir="${code.resources}" includes="templates/**/*.properties" />
- <fileset dir="${code.i18n}" />
- <fileset dir="src/main/resources" includes="ini/*.*" />
+ <fileset dir="src/main/resources" />
</jar>
</target>
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1477087&r1=1477086&r2=1477087&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Mon Apr 29 14:08:53 2013
@@ -123,6 +123,11 @@
<version>2.6</version>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
@@ -207,20 +212,6 @@
<build>
<finalName>JSPWiki</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>etc/i18n</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
@@ -276,6 +267,14 @@
<phase>generate-resources</phase>
<configuration>
<target>
+ <!-- Creating a specific _en file presently needed just so that "English" will appear as an option on
+ the User Preferences page, language option (and similar issues). FIXME: change JSP code
+ so this is no longer necessary.
+ -->
+ <copy file="src/main/resources/CoreResources.properties" tofile="target/classes/CoreResources_en.properties"/>
+ <copy file="src/main/resources/templates/default.properties" tofile="target/classes/templates/default_en.properties"/>
+ <copy file="src/main/resources/plugin/PluginResources.properties" tofile="target/classes/plugin/PluginResources_en.properties"/>
+
<copy file="tests/etc/userdatabase.xml.tmpl" toFile="tests/etc/userdatabase.xml"/>
<copy file="tests/etc/groupdatabase.xml.tmpl" toFile="tests/etc/groupdatabase.xml"/>
<copy file="etc/jspwiki.properties.tmpl" tofile="etc/jspwiki.properties" />
Modified: incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java?rev=1477087&r1=1477086&r2=1477087&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java Mon Apr 29 14:08:53 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 = "4";
+ public static final String BUILD = "5";
/**
* This is the generic version string you should use
Added: incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/filters/profanity.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/filters/profanity.properties?rev=1477087&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/filters/profanity.properties (added)
+++ incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/filters/profanity.properties Mon Apr 29 14:08:53 2013
@@ -0,0 +1,26 @@
+#
+#
+# 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
+# regarding copyright ownership. The ASF licenses this file
+# 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.
+#
+#
+
+# Feel free to fill this file with your preferred profanities, at the rate of one
+# profanity per line. The match performed against this file is case-unsensitive
+
+fuck
+shit
Added: incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/plugin/denounce.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/plugin/denounce.properties?rev=1477087&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/plugin/denounce.properties (added)
+++ incubator/jspwiki/trunk/src/main/resources/org/apache/wiki/plugin/denounce.properties Mon Apr 29 14:08:53 2013
@@ -0,0 +1,51 @@
+#
+#
+# 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
+# regarding copyright ownership. The ASF licenses this file
+# 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.
+#
+#
+
+#
+# This file contains different patterns for the Denounce plugin.
+#
+# Please send me new patterns as you figure them out.
+#
+
+denounce.denouncetext = <Link removed because I do not wish to endorse this link to search engines>
+
+#
+# Which user agents should be denounced.
+#
+denounce.agentpattern.googlebot = *Googlebot*
+denounce.agentpattern.inktomi = *Slurp/*
+denounce.agentpattern.fastsearch = *FAST-WebCrawler/*
+denounce.agentpattern.voila = *VoilaBot*
+denounce.agentpattern.ms = *MicrosoftPrototypeCrawler*
+denounce.agentpattern.grub = *grub-client*
+#
+# Which referers should be denounced.
+#
+#denounce.refererpattern = http://localhost/*
+
+#
+# Which hostpatterns should be denounced. This uses the result
+# of ServletRequest.getRemoteHost(), which may return an IP address as
+# well, if the name cannot be determined.
+#
+denounce.hostpattern.googlebot = *.googlebot.com
+denounce.hostpattern.inktomi = *.inktomisearch.com
+denounce.hostpattern.alexa = crawl*.alexa.com