[mapserver-commits] r11474 - in trunk/mapserver/mapscript/java: . examples

[svn at osgeo.org]

Author: unicoletti
Date: 2011-04-06 03:17:42 -0700 (Wed, 06 Apr 2011)
New Revision: 11474

Modified:
   trunk/mapserver/mapscript/java/Makefile.in
   trunk/mapserver/mapscript/java/examples/QueryByAttributeUnicode.java
Log:
fix QueryByAttributeUnicode encoding, make test pass again #3726

Modified: trunk/mapserver/mapscript/java/Makefile.in
===================================================================
--- trunk/mapserver/mapscript/java/Makefile.in	2011-04-06 03:05:02 UTC (rev 11473)
+++ trunk/mapserver/mapscript/java/Makefile.in	2011-04-06 10:17:42 UTC (rev 11474)
@@ -297,7 +297,7 @@
 ifneq ($(GDAL),)
 test:
 	$(JAVAC) -classpath ./:examples/:./mapscript.jar -d examples/ examples/RFC24.java examples/ConnPool.java examples/DrawMap.java examples/DumpShp.java examples/MakePoint.java examples/QueryByAttribute.java examples/ShapeInfo.java examples/WxSTest.java examples/Metadata.java examples/RunTimeBuiltWMSClient.java
-	$(JAVAC) -encoding iso-8859-15 -classpath ./:examples/:./mapscript.jar -d examples/ examples/QueryByAttributeUnicode.java 
+	$(JAVAC) -encoding utf8 -classpath ./:examples/:./mapscript.jar -d examples/ examples/QueryByAttributeUnicode.java 
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. DumpShp ../../tests/point.shp
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. ShapeInfo ../../tests/point.shp ../../tests/point.dbf
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. DrawMap ../../tests/test.map ./map.png
@@ -309,7 +309,7 @@
 	@echo "WARN: Skipping WxSTest because OWS is not enabled"
 endif
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. RFC24 ../../tests/test.map
-	LC_ALL=de_DE $(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. QueryByAttributeUnicode data/subset-umlauts.map
+	LC_ALL=en_US.UTF-8 $(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. QueryByAttributeUnicode data/subset-umlauts.map
 else
 test:
 	@echo "To run the tests GDAL and PROJ must be enabled"

Modified: trunk/mapserver/mapscript/java/examples/QueryByAttributeUnicode.java
===================================================================
--- trunk/mapserver/mapscript/java/examples/QueryByAttributeUnicode.java	2011-04-06 03:05:02 UTC (rev 11473)
+++ trunk/mapserver/mapscript/java/examples/QueryByAttributeUnicode.java	2011-04-06 10:17:42 UTC (rev 11474)
@@ -3,7 +3,7 @@
 public class QueryByAttributeUnicode {
 	public static void main(String[] args)  {
 
-		String filter="/Südliche Weinstraße/";
+		String filter="/Südliche Weinstraße/";
 		if (args.length == 2) {
 			filter=args[1];
 		}