Revision: 7980 http://languagetool.svn.sourceforge.net/languagetool/?rev=7980&view=rev Author: dnaber Date: 2012-09-02 22:25:14 +0000 (Sun, 02 Sep 2012) Log Message: ----------- adapt files and tests to resources moved below org.languagetool
Modified Paths: -------------- trunk/JLanguageTool/build.properties trunk/JLanguageTool/build.xml trunk/JLanguageTool/src/main/java/org/languagetool/databroker/ResourceDataBroker.java trunk/JLanguageTool/src/test/java/org/languagetool/LanguageTest.java trunk/JLanguageTool/src/test/java/org/languagetool/dev/index/IndexerSearcherTest.java Modified: trunk/JLanguageTool/build.properties =================================================================== --- trunk/JLanguageTool/build.properties 2012-09-02 22:11:13 UTC (rev 7979) +++ trunk/JLanguageTool/build.properties 2012-09-02 22:25:14 UTC (rev 7980) @@ -20,8 +20,8 @@ junit.classes.dir = ./junit.classes junit.instrumented-classes.dir = ./junit.instrumented-classes resource.dir = ./src/main/resources -lang.resource.dir = ${resource.dir}/resource -rules.dir = ./src/main/resources/rules +lang.resource.dir = ${resource.dir}/org/languagetool/resource +rules.dir = ./src/main/resources/org/languagetool/rules ext.dir = ./libs ext.ooo.dir = ./libs/ooo Modified: trunk/JLanguageTool/build.xml =================================================================== --- trunk/JLanguageTool/build.xml 2012-09-02 22:11:13 UTC (rev 7979) +++ trunk/JLanguageTool/build.xml 2012-09-02 22:25:14 UTC (rev 7980) @@ -487,7 +487,7 @@ </target> <target name="common" depends="clean,init,build"> - <copy file="${resource.dir}/resource/TrayIcon.png" todir="${dist.dir}/resource/" /> + <copy file="${resource.dir}/org/languagetool/resource/TrayIcon.png" todir="${dist.dir}/resource/" /> <filter filtersFile="build.properties" /> <copy file="./README.txt" todir="${dist.dir}" /> Modified: trunk/JLanguageTool/src/main/java/org/languagetool/databroker/ResourceDataBroker.java =================================================================== --- trunk/JLanguageTool/src/main/java/org/languagetool/databroker/ResourceDataBroker.java 2012-09-02 22:11:13 UTC (rev 7979) +++ trunk/JLanguageTool/src/main/java/org/languagetool/databroker/ResourceDataBroker.java 2012-09-02 22:25:14 UTC (rev 7980) @@ -59,12 +59,12 @@ /** * The directory name of the {@code /resource} directory. */ - public static final String RESOURCE_DIR = "/resource"; + public static final String RESOURCE_DIR = "/org/languagetool/resource"; /** * The directory name of the {@code /rules} directory. */ - public static final String RULES_DIR = "/rules"; + public static final String RULES_DIR = "/org/languagetool/rules"; /** * Gets any resource from the grammar checker's {@code /resource} directory. Modified: trunk/JLanguageTool/src/test/java/org/languagetool/LanguageTest.java =================================================================== --- trunk/JLanguageTool/src/test/java/org/languagetool/LanguageTest.java 2012-09-02 22:11:13 UTC (rev 7979) +++ trunk/JLanguageTool/src/test/java/org/languagetool/LanguageTest.java 2012-09-02 22:25:14 UTC (rev 7980) @@ -36,10 +36,10 @@ @Test public void testRuleFileName() { - assertEquals("[/rules/en/grammar.xml, /rules/en/en-GB/grammar.xml]", Language.BRITISH_ENGLISH.getRuleFileName().toString()); - assertEquals("[/rules/en/grammar.xml]", Language.AMERICAN_ENGLISH.getRuleFileName().toString()); - assertEquals("[/rules/en/grammar.xml]", Language.ENGLISH.getRuleFileName().toString()); - assertEquals("[/rules/de/grammar.xml]", Language.GERMAN.getRuleFileName().toString()); + assertEquals("[/org/languagetool/rules/en/grammar.xml, /org/languagetool/rules/en/en-GB/grammar.xml]", Language.BRITISH_ENGLISH.getRuleFileName().toString()); + assertEquals("[/org/languagetool/rules/en/grammar.xml]", Language.AMERICAN_ENGLISH.getRuleFileName().toString()); + assertEquals("[/org/languagetool/rules/en/grammar.xml]", Language.ENGLISH.getRuleFileName().toString()); + assertEquals("[/org/languagetool/rules/de/grammar.xml]", Language.GERMAN.getRuleFileName().toString()); } @Test Modified: trunk/JLanguageTool/src/test/java/org/languagetool/dev/index/IndexerSearcherTest.java =================================================================== --- trunk/JLanguageTool/src/test/java/org/languagetool/dev/index/IndexerSearcherTest.java 2012-09-02 22:11:13 UTC (rev 7979) +++ trunk/JLanguageTool/src/test/java/org/languagetool/dev/index/IndexerSearcherTest.java 2012-09-02 22:25:14 UTC (rev 7980) @@ -43,7 +43,7 @@ public class IndexerSearcherTest extends LuceneTestCase { - private final File ruleFile = new File("src/main/resources/rules/en/grammar.xml"); + private final File ruleFile = new File("src/main/resources/org/languagetool/rules/en/grammar.xml"); private final Searcher errorSearcher = new Searcher(); private IndexSearcher searcher; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Languagetool-cvs mailing list Languagetool-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/languagetool-cvs