mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-24 23:17:56 +01:00
Fix I18n issue.
This commit is contained in:
parent
131d5b18e8
commit
2efa40c664
@ -22,6 +22,7 @@ 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);
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
# 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
|
||||
|
Loading…
Reference in New Issue
Block a user