vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-21 21:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix I18n issue.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2010-01-19 00:39:52 -03:00
parent 131d5b18e8
commit 2efa40c664
2 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
View File

@ -1,27 +1,28 @@
/* /*
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. * this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0 * 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 not use this file except in compliance with
* the License. You may obtain a copy of the License at * the License. You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* $Id: file 64488 2006-03-10 17:32:09Z paulo $ * $Id: file 64488 2006-03-10 17:32:09Z paulo $
*/ */
package com.wisemapping.util; package com.wisemapping.util;
import java.io.IOException; import java.io.IOException;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.nio.charset.Charset;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
@ -43,7 +44,10 @@ public class ZipUtils {
StringBuffer sb_result = new StringBuffer(); StringBuffer sb_result = new StringBuffer();
while ((len = zipIn.read(buffer)) > 0) { 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(); zipIn.closeEntry();
@ -57,7 +61,9 @@ public class ZipUtils {
public static byte[] stringToZip(String content) throws IOException { public static byte[] stringToZip(String content) throws IOException {
ZipOutputStream zip = null; ZipOutputStream zip = null;
ByteArrayOutputStream byteArray = new ByteArrayOutputStream(); ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes());
ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"));
try { try {
zip = new ZipOutputStream(byteArray); zip = new ZipOutputStream(byteArray);

26
wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
View File

@ -1,10 +1,22 @@
log4j.rootCategory=WARN, stdout log4j.rootLogger=WARN, stdout, R
log4j.net.sf=FATAL,stdout log4j.logger.net.sf=FATAL,stdout, R
log4j.com.wisemapping=DEBUG,stdout log4j.logger.com.wisemapping=WARN,stdout,R
log4j.org.wisemapping.ws=DEBUG,stdout log4j.logger.org.wisemapping.ws= WARN,stdout, R
log4j.logger.org.acegisecurity.event.authentication= FATAL,stdout, R
##log4j.category.net.sf.acegisecurity=DEBUG,
# Stdout logger É
log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n 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