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/05/24 00:27:55 UTC
svn commit: r1485880 - in /incubator/jspwiki/trunk: ChangeLog build.xml
pom.xml src/main/java/org/apache/wiki/Release.java
src/test/resources/jdbc.properties
Author: gmazza
Date: Thu May 23 22:27:55 2013
New Revision: 1485880
URL: http://svn.apache.org/r1485880
Log:
Minor cleanups related to Mavenization -- see ChangeLog.
Modified:
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
incubator/jspwiki/trunk/src/test/resources/jdbc.properties
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1485880&r1=1485879&r2=1485880&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu May 23 22:27:55 2013
@@ -1,5 +1,14 @@
2013-05-23 Glen Mazza (gmazza AT apache DOT org)
+ * 2.9.2-incubating-13
+
+ * Adjusted exclusions in Apache Rat, nonvital
+ i18n stuff removed from build.xml, HSQLDB now
+ writing temp files to target instead of base
+ directory (easier to remove that way).
+
+2013-05-23 Glen Mazza (gmazza AT apache DOT org)
+
* 2.9.2-incubating-12
* Removed Cobertura and Sonar tasks from Ant build
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1485880&r1=1485879&r2=1485880&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Thu May 23 22:27:55 2013
@@ -41,9 +41,6 @@
a good habit to keep .class -files separate from the .java -files. -->
<property name="code.build" value ="target/classes" />
- <!-- The i18n location in which 18n templates are created -->
- <property name="tmplt.i18n.dir" value="i18n_templates" />
-
<!-- The location for the JAR file for the core JSPWiki classes -->
<property name="jarfile" value="target/JSPWiki/WEB-INF/lib/jspwiki-2.9.2-SNAPSHOT.jar" />
@@ -752,49 +749,4 @@ To automate the JAR signing processs, yo
</sequential>
</macrodef>
- <!-- ============================================================== -->
- <target name="i18n-create-template" description="Creates a given directory structure with all the needed files to make an i18n jar">
- <input message="i18n template code to generate (ie: es_ES):" addproperty="i18n.template" />
-
- <mkdir dir="${tmplt.i18n.dir}/${ant.project.name}_${i18n.template}/etc/i18n/templates" />
- <mkdir dir="${tmplt.i18n.dir}/${ant.project.name}_${i18n.template}/etc/i18n/plugin" />
-
- <copy file="etc/i18n/CoreResources.properties"
- tofile="${tmplt.i18n.dir}/${ant.project.name}_${i18n.template}/etc/i18n/CoreResources_${i18n.template}.properties"
- overwrite="true"/>
- <copy file="etc/i18n/templates/default.properties"
- tofile="${tmplt.i18n.dir}/${ant.project.name}_${i18n.template}/etc/i18n/templates/default_${i18n.template}.properties"
- overwrite="true"/>
- <copy file="etc/i18n/plugin/PluginResources.properties"
- tofile="${tmplt.i18n.dir}/${ant.project.name}_${i18n.template}/etc/i18n/plugin/PluginResources_${i18n.template}.properties"
- overwrite="true" />
-
- <echo message="Now you can start translating at ${tmplt.i18n.dir}/${ant.project.name}_${i18n.template}." />
- <echo message="When finished, execute i18n-jar-template target to jar it" />
- </target>
-
- <target name="i18n-jar-template" description="Jars a given i18n directory structure">
- <input message="i18n template code to jar (ie: es_ES):" addproperty="i18n.template" />
- <jar jarfile="${code.build}/${ant.project.name}_${i18n.template}.jar">
- <fileset dir="${tmplt.i18n.dir}/${ant.project.name}_${i18n.template}" includes="**/*.properties" />
- </jar>
- <echo message="Created ${code.build}/${ant.project.name}_${i18n.template}.jar. Drop it on your web/WEB-INF/lib folder and that should do the i18n trick" />
- <echo message="You can also upload the jar to http://jspwiki.org/wiki/ContributedLocalizations or to any page linked to it to make it available for everyone!" />
- </target>
-
- <target name="i18n-clean-templates" description="Deletes all i18n directory structures">
- <delete dir="${tmplt.i18n.dir}" />
- </target>
-
- <target name="i18n-check"
- description="Run this target to check whether a translation is up to date.">
- <input message="Please give the language you want to check translation for (e.g. fi, es, de)"
- addproperty="check.language"/>
- <java classname="org.apache.wiki.TranslationsCheck">
- <classpath path="${tests.build}"/>
- <classpath path="${code.build}"/>
- <arg line="${check.language}"/>
- </java>
- </target>
-
</project>
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1485880&r1=1485879&r2=1485880&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Thu May 23 22:27:55 2013
@@ -496,24 +496,25 @@
using rat:check activates old Codehaus plugin instead.
-->
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
- <configuration>
- <excludes>
- <exclude>src/main/config/doc/LICENSE.*</exclude> <!-- License files -->
- <exclude>src/main/config/wikipages/**</exclude> <!-- Default wikipages -->
- <!-- ChangeLog excluded by default, this is, well, an old ChangeLog -->
- <exclude>src/main/config/dev/OldChangeLog</exclude>
- <exclude>src/main/webapp/scripts/*.js</exclude> <!-- minified files -->
- <exclude>src/test/resources/TextFormattingRules.txt</exclude> <!-- test input data -->
- <!-- license, required by Silk Icon set cfr. NOTICE, LICENSE, etc. -->
- <exclude>src/main/webapp/templates/default/images/SilkIconSet-readme.txt</exclude>
- <exclude>tests/**</exclude> <!-- legacy stuff used by Ant -->
- <exclude>build/**</exclude> <!-- legacy stuff used by Ant -->
- </excludes>
- </configuration>
- </plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.8</version>
+ <configuration>
+ <excludes>
+ <exclude>src/main/config/doc/LICENSE.*</exclude> <!-- License files -->
+ <exclude>src/main/config/wikipages/**</exclude> <!-- Default wikipages -->
+ <!-- ChangeLog excluded by default, this is, well, an old ChangeLog -->
+ <exclude>src/main/config/dev/OldChangeLog</exclude>
+ <exclude>src/main/webapp/scripts/*.js</exclude> <!-- minified files -->
+ <exclude>src/test/resources/TextFormattingRules.txt</exclude> <!-- test input data -->
+ <!-- license, required by Silk Icon set cfr. NOTICE, LICENSE, etc. -->
+ <exclude>src/main/webapp/templates/default/images/SilkIconSet-readme.txt</exclude>
+ <exclude>tests/**</exclude> <!-- legacy stuff used by Ant -->
+ <exclude>build/**</exclude> <!-- legacy stuff used by Ant -->
+ <exclude>rss.rdf</exclude> <!-- can this go in config/dev? -->
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
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=1485880&r1=1485879&r2=1485880&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 Thu May 23 22:27:55 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 = "12";
+ public static final String BUILD = "13";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/test/resources/jdbc.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/resources/jdbc.properties?rev=1485880&r1=1485879&r2=1485880&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/test/resources/jdbc.properties (original)
+++ incubator/jspwiki/trunk/src/test/resources/jdbc.properties Thu May 23 22:27:55 2013
@@ -19,7 +19,7 @@
#Used only in testing
server.port=9001
-server.database.0=file:jspwiki.hsqldb
+server.database.0=file:target/jspwiki.hsqldb
server.dbname.0=jspwiki
jdbc.admin.id=SA