[LanguageTool] SF.net SVN: languagetool:[8000] trunk/website/www

2012-09-08 Thread dnaber
Revision: 8000
  
http://languagetool.svn.sourceforge.net/languagetool/?rev=8000view=rev
Author:   dnaber
Date: 2012-09-08 11:46:17 + (Sat, 08 Sep 2012)
Log Message:
---
link fixes

Modified Paths:
--
trunk/website/www/languages/index.php
trunk/website/www/news/archive.php

Modified: trunk/website/www/languages/index.php
===
--- trunk/website/www/languages/index.php   2012-09-08 11:41:51 UTC (rev 
7999)
+++ trunk/website/www/languages/index.php   2012-09-08 11:46:17 UTC (rev 
8000)
@@ -31,33 +31,33 @@
 /tr
 /thead
 tbody
-trtd valign=topAsturian/tdtd valign=top align=right61/tdtd 
valign=top align=righta 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/ast/grammar.xml;Show/a
 / a 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/ast/grammar.xml?content-type=text%2Fplain;XML/a
 / a 
href=http://community.languagetool.org/rule/list?lang=ast;Browse/a/tdtd 
valign=top align=right0/tdtd valign=top align=right0/tdtd 
valign=topyes/tdtd valign=top align=leftXesús González Rato/td/tr
-trtd valign=topBelarusian/tdtd valign=top align=right7/tdtd 
valign=top align=righta 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/be/grammar.xml;Show/a
 / a 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/be/grammar.xml?content-type=text%2Fplain;XML/a
 / a 
href=http://community.languagetool.org/rule/list?lang=be;Browse/a/tdtd 
valign=top align=right0/tdtd valign=top align=right0/tdtd 
valign=topyes/tdtd valign=top align=leftAlex Buloichik/td/tr
-trtd valign=topa href=../br/Breton/a/tdtd valign=top 
align=right461/tdtd valign=top align=righta 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/br/grammar.xml;Show/a
 / a 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/br/grammar.xml?content-type=text%2Fplain;XML/a
 / a 
href=http://community.languagetool.org/rule/list?lang=br;Browse/a/tdtd 
valign=top align=right0/tdtd valign=top align=right0/tdtd 
valign=top-/tdtd valign=top align=lefta 
href=http://dominiko.livejournal.com/tag/lingvoilo;Dominique Pellé/a, Fulup 
Jakez/td/tr
-trtd valign=topCatalan/tdtd valign=top align=right488/tdtd 
valign=top align=righta 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/ca/grammar.xml;Show/a
 / a 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/ca/grammar.xml?content-type=text%2Fplain;XML/a
 / a 
href=http://community.languagetool.org/rule/list?lang=ca;Browse/a/tdtd 
valign=top align=right7/tdtd valign=top align=right4/tdtd 
valign=topyes/tdtd valign=top align=leftRicard Roca, Jaume 
Ortolà/td/tr
-trtd valign=topa href=../zh/Chinese/a/tdtd valign=top 
align=right328/tdtd valign=top align=righta 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/zh/grammar.xml;Show/a
 / a 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/zh/grammar.xml?content-type=text%2Fplain;XML/a
 / a 
href=http://community.languagetool.org/rule/list?lang=zh;Browse/a/tdtd 
valign=top align=right0/tdtd valign=top align=right0/tdtd 
valign=top-/tdtd valign=top align=leftTao Lin, Fangjie Wang, Wenting 
Cheng, Xiang Yao, Tong Wang, Jiawen Mo, Jiarong Li, Weijie Huang, Yixin Zhou, 
Xinmin Chen, Xiaofei Liu, Debiao Luo/td/tr
-trtd valign=topDanish/tdtd valign=top align=right22/tdtd 
valign=top align=righta 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/da/grammar.xml;Show/a
 / a 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/da/grammar.xml?content-type=text%2Fplain;XML/a
 / a 
href=http://community.languagetool.org/rule/list?lang=da;Browse/a/tdtd 
valign=top align=right0/tdtd valign=top align=right0/tdtd 
valign=topyes/tdtd valign=top align=leftEsben Aaberg/td/tr
-trtd valign=topDutch/tdtd valign=top align=right336/tdtd 
valign=top align=righta 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/nl/grammar.xml;Show/a
 / a 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/nl/grammar.xml?content-type=text%2Fplain;XML/a
 / a 
href=http://community.languagetool.org/rule/list?lang=nl;Browse/a/tdtd 
valign=top align=right0/tdtd valign=top align=right0/tdtd 
valign=topyes/tdtd valign=top align=lefta 
href=http://www.opentaal.org;Ruud Baars/a/td/tr
-trtd valign=topEnglish/tdtd valign=top align=right869/tdtd 
valign=top align=righta 
href=http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules/en/grammar.xml;Show/a
 / a 

[LanguageTool] SF.net SVN: languagetool:[8002] trunk/JLanguageTool

2012-09-08 Thread dnaber
Revision: 8002
  
http://languagetool.svn.sourceforge.net/languagetool/?rev=8002view=rev
Author:   dnaber
Date: 2012-09-08 23:03:38 + (Sat, 08 Sep 2012)
Log Message:
---
extend the HTTP XML output for the /Languages URL to also contain the 
language code with its variant

Modified Paths:
--
trunk/JLanguageTool/CHANGES.txt

trunk/JLanguageTool/src/main/java/org/languagetool/server/LanguageToolHttpHandler.java

trunk/JLanguageTool/src/test/java/org/languagetool/server/HTTPServerTest.java

Modified: trunk/JLanguageTool/CHANGES.txt
===
--- trunk/JLanguageTool/CHANGES.txt 2012-09-08 12:02:14 UTC (rev 8001)
+++ trunk/JLanguageTool/CHANGES.txt 2012-09-08 23:03:38 UTC (rev 8002)
@@ -75,6 +75,11 @@
  -HTTP API: + was incorrectly removed from input (Sourceforge bug #3543914), 
patch by
   Sourceforge user hiddenspirit
 
+ -HTTP API: the XML returned by the /Languages URL (which returns a list of 
all supported
+  languages) has been extended to contain an 'abbrWithVariant' attribute which 
lists the
+  language with its variant, e.g.:
+  language name=Catalan abbr=ca abbrWithVariant=ca-ES/
+
  -HTTP API and XML output: extended XML to include the version and build date
   of LanguageTool and the category of each match
 

Modified: 
trunk/JLanguageTool/src/main/java/org/languagetool/server/LanguageToolHttpHandler.java
===
--- 
trunk/JLanguageTool/src/main/java/org/languagetool/server/LanguageToolHttpHandler.java
  2012-09-08 12:02:14 UTC (rev 8001)
+++ 
trunk/JLanguageTool/src/main/java/org/languagetool/server/LanguageToolHttpHandler.java
  2012-09-08 23:03:38 UTC (rev 8002)
@@ -264,17 +264,17 @@
  
 
   /**
-   * Construct an xml string containing all supported languages. br/The xml 
format is:br/
+   * Construct an XML string containing all supported languages. br/The XML 
format looks like this:br/br/
* lt;languagesgt;br/
-   *nbsp;nbsp;lt;language name=Catalan abbr=ca /gt;br/ 
-   *nbsp;nbsp;lt;language name=Dutch abbr=nl /gt;br/
-   *nbsp;nbsp;...br/
-   *  lt;languagesgt;br/
-   *  The languages are alphabetically sorted.  
-   * @return an xml string containing all supported languages.
+   *nbsp;nbsp;lt;language name=Catalan abbr=ca 
abbrWithVariant=ca-ES/gt;br/
+   *nbsp;nbsp;lt;language name=German abbr=de 
abbrWithVariant=de/gt;br/
+   *nbsp;nbsp;lt;language name=German (Germany) abbr=de 
abbrWithVariant=de-DE/gt;br/
+   *  lt;languagesgt;br/br/
+   *  The languages are sorted alphabetically by their name.
+   * @return an XML document listing all supported languages
*/
   public static String getSupportedLanguagesAsXML() {
-Language[] languageCopy = Language.REAL_LANGUAGES.clone();
+final Language[] languageCopy = Language.REAL_LANGUAGES.clone();
 final ListLanguage languages = Arrays.asList(languageCopy);
 Collections.sort(languages, new ComparatorLanguage() {
   @Override
@@ -284,7 +284,8 @@
 });
 final StringBuilder xmlBuffer = new StringBuilder(?xml version='1.0' 
encoding='UTF-8'?\nlanguages\n);
 for (Language lang : languages) {
-  xmlBuffer.append(String.format(\tlanguage name=\%s\ abbr=\%s\ / 
\n, lang.getName(), lang.getShortName()));
+  xmlBuffer.append(String.format(\tlanguage name=\%s\ abbr=\%s\ 
abbrWithVariant=\%s\/ \n, lang.getName(),
+  lang.getShortName(), lang.getShortNameWithVariant()));
 }
 xmlBuffer.append(/languages\n);
 return xmlBuffer.toString();

Modified: 
trunk/JLanguageTool/src/test/java/org/languagetool/server/HTTPServerTest.java
===
--- 
trunk/JLanguageTool/src/test/java/org/languagetool/server/HTTPServerTest.java   
2012-09-08 12:02:14 UTC (rev 8001)
+++ 
trunk/JLanguageTool/src/test/java/org/languagetool/server/HTTPServerTest.java   
2012-09-08 23:03:38 UTC (rev 8002)
@@ -93,6 +93,9 @@
 if (!languagesXML.contains(Romanian) || 
!languagesXML.contains(English)) {
   fail(Error getting supported languages:  + languagesXML);
 }
+if (!languagesXML.contains(abbr=\de\) || 
!languagesXML.contains(abbrWithVariant=\de-DE\)) {
+  fail(Error getting supported languages:  + languagesXML);
+}
 // tests for  character
 assertTrue(check(Language.ENGLISH, Me  you you).contains());
 // tests for mother tongue (copy from link {@link FalseFriendRuleTest})   

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 

[LanguageTool] SF.net SVN: languagetool:[8003] trunk/JLanguageTool/src/main/resources/org/ languagetool/rules/fr/grammar.xml

2012-09-08 Thread dominikoeo
Revision: 8003
  
http://languagetool.svn.sourceforge.net/languagetool/?rev=8003view=rev
Author:   dominikoeo
Date: 2012-09-08 23:43:51 + (Sat, 08 Sep 2012)
Log Message:
---
[fr] fixed false positive in Les quartiers conquis par l'arm?\195?\169e

Modified Paths:
--
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/fr/grammar.xml

Modified: 
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/fr/grammar.xml
===
--- 
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/fr/grammar.xml
2012-09-08 23:03:38 UTC (rev 8002)
+++ 
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/fr/grammar.xml
2012-09-08 23:43:51 UTC (rev 8003)
@@ -5542,7 +5542,7 @@
 /token
 marker
 token postag=V.* postag_regexp=yes
-exception postag=V .* 3 p|V ppa . p|V.* ppr|J . 
p postag_regexp=yes/
+exception postag=V .* 3 p|V ppa . s?p|V.* ppr|J 
. s?p postag_regexp=yes/
 /token
 /marker
 /pattern
@@ -,6 +,7 @@
 example type=correctTout Paris est à la fête./example
 example type=correctL’eau des lacs et des rivières est 
douce./example
 example type=correctLequel des élèves est sorti ?/example
+example type=correctLes quartiers conquis par 
l’armée./example
 /rule
 rule name=sujet pluriel + 1 token + verbe singulier
 pattern
@@ -5564,7 +5565,7 @@
 token regexp=yes[lmnt]e|la|les|leur|lui|en|y/token
 marker
 token postag=V.* postag_regexp=yes
-exception postag=V .* 3 p|V ppa . p|V.* 
ppr|[NJ].* postag_regexp=yes/
+exception postag=V .* 3 p|V ppa . s?p|V.* 
ppr|[NJ].* postag_regexp=yes/
 /token
 /marker
 /pattern
@@ -5582,7 +5583,7 @@
 token 
regexp=yes[’´'‛′‘]|[mnt]e|la|les?|[vn]ous|en|y|lui|leur/token
 marker
 token postag=V.* postag_regexp=yes
-exception postag=V .* 3 p|V ppa . p|V.* ppr|J . 
p postag_regexp=yes/
+exception postag=V .* 3 p|V ppa . s?p|V.* ppr|J 
. s?p postag_regexp=yes/
 /token
 /marker
 /pattern
@@ -5603,7 +5604,7 @@
 token 
regexp=yes[’´'‛′‘]|l[ea]|[vn]ous|lui|leur|en|y/token
 marker
 token postag=V.* postag_regexp=yes
-exception postag=V .* 3 p|V ppa . p|V.* ppr|J . 
p postag_regexp=yes/
+exception postag=V .* 3 p|V ppa . s?p|V.* ppr|J 
. s?p postag_regexp=yes/
 /token
 /marker
 /pattern
@@ -5623,7 +5624,7 @@
 token regexp=yesen|y/token
 marker
 token postag=V.* postag_regexp=yes
-exception postag=V .* 3 p|V ppa . p|V.* ppr|J . 
p postag_regexp=yes/
+exception postag=V .* 3 p|V ppa . s?p|V.* ppr|J 
. s?p postag_regexp=yes/
 /token
 /marker
 /pattern

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


[LanguageTool] SF.net SVN: languagetool:[8004] trunk/JLanguageTool/src/main/java/org/ languagetool/server/LanguageToolHttpHandler.java

2012-09-08 Thread dnaber
Revision: 8004
  
http://languagetool.svn.sourceforge.net/languagetool/?rev=8004view=rev
Author:   dnaber
Date: 2012-09-08 23:46:43 + (Sat, 08 Sep 2012)
Log Message:
---
tiny code cleanup: close http exchange in finally block

Modified Paths:
--

trunk/JLanguageTool/src/main/java/org/languagetool/server/LanguageToolHttpHandler.java

Modified: 
trunk/JLanguageTool/src/main/java/org/languagetool/server/LanguageToolHttpHandler.java
===
--- 
trunk/JLanguageTool/src/main/java/org/languagetool/server/LanguageToolHttpHandler.java
  2012-09-08 23:43:51 UTC (rev 8003)
+++ 
trunk/JLanguageTool/src/main/java/org/languagetool/server/LanguageToolHttpHandler.java
  2012-09-08 23:46:43 UTC (rev 8004)
@@ -1,9 +1,6 @@
 package org.languagetool.server;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URLDecoder;
@@ -85,6 +82,7 @@
   e.printStackTrace();
   final String response = Error:  + 
StringTools.escapeXML(Tools.getFullStackTrace(e));
   sendError(httpExchange, HttpURLConnection.HTTP_INTERNAL_ERROR, response);
+} finally {
   httpExchange.close();
 }
 print(Check done in  + (System.currentTimeMillis() - timeStart) + ms);
@@ -123,7 +121,6 @@
 final String response = getSupportedLanguagesAsXML();
 httpExchange.sendResponseHeaders(HttpURLConnection.HTTP_OK, 
response.getBytes(ENCODING).length);
 httpExchange.getResponseBody().write(response.getBytes(ENCODING));
-httpExchange.close();
   }
 
   private void checkText(String text, HttpExchange httpExchange, MapString, 
String parameters) throws Exception {
@@ -179,7 +176,6 @@
 CONTEXT_SIZE, StringTools.XmlPrintMode.NORMAL_XML);
 httpExchange.sendResponseHeaders(HttpURLConnection.HTTP_OK, 
response.getBytes(ENCODING).length);
 httpExchange.getResponseBody().write(response.getBytes(ENCODING));
-httpExchange.close();
   }
 
   private MapString, String parseQuery(String query) throws 
UnsupportedEncodingException {

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