From 2efa40c6646fbf69921db792218c7da746efc4cc Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <paulo@thecrow-office.local>
Date: Tue, 19 Jan 2010 00:39:52 -0300
Subject: [PATCH] Fix I18n issue.

---
 .../java/com/wisemapping/util/ZipUtils.java   | 48 +++++++++++--------
 .../webapp/WEB-INF/classes/log4j.properties   | 26 +++++++---
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java b/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
index 520a90c6..cc752d0d 100755
--- a/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
@@ -1,27 +1,28 @@
-/*
-* 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.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
+/*
+* 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.
+*
+* $Id: file 64488 2006-03-10 17:32:09Z paulo $
+*/
+
 package com.wisemapping.util;
 
 import java.io.IOException;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.nio.charset.Charset;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 import java.util.zip.ZipEntry;
@@ -43,7 +44,10 @@ public class ZipUtils {
             StringBuffer sb_result = new StringBuffer();
 
             while ((len = zipIn.read(buffer)) > 0) {
-                sb_result.append(new String(buffer, 0, len));
+
+
+
+                sb_result.append(new String(buffer, 0, len, Charset.forName("UTF-8")));
             }
 
             zipIn.closeEntry();
@@ -57,7 +61,9 @@ public class ZipUtils {
     public static  byte[] stringToZip(String content) throws IOException {
         ZipOutputStream zip = null;
         ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
-        ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes());
+
+        
+        ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"));
         try {
             zip = new ZipOutputStream(byteArray);
 
diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
index 32a2b197..005fe660 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -1,10 +1,22 @@
-log4j.rootCategory=WARN, stdout
-log4j.net.sf=FATAL,stdout
-log4j.com.wisemapping=DEBUG,stdout
-log4j.org.wisemapping.ws=DEBUG,stdout
-
-##log4j.category.net.sf.acegisecurity=DEBUG,
+log4j.rootLogger=WARN, stdout, R
+log4j.logger.net.sf=FATAL,stdout, R
+log4j.logger.com.wisemapping=WARN,stdout,R
+log4j.logger.org.wisemapping.ws= WARN,stdout, R
+log4j.logger.org.acegisecurity.event.authentication= FATAL,stdout, R
 
+# Stdout logger É
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
+
+
+# File Writter Logger  É
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=/var/log/tomcat6/wisemapping.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %p %c - %m%n