mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to newer fileupload, lang libs

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2598 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-03-27 19:20:50 +00:00
parent fe9e0ccf6a
commit e5591c71fd
7 changed files with 214 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
zxingorg/src/com/google/zxing/web/DecodeServlet.java
View file

@ -36,10 +36,13 @@ import com.google.zxing.multi.MultipleBarcodeReader;
import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.FileCleanerCleanup;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.io.FileCleaningTracker;
import java.awt.color.CMMException; import java.awt.color.CMMException;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
@ -55,12 +58,12 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
@ -98,8 +101,12 @@ public final class DecodeServlet extends HttpServlet {
@Override @Override
public void init(ServletConfig servletConfig) { public void init(ServletConfig servletConfig) {
Logger logger = Logger.getLogger("com.google.zxing"); Logger logger = Logger.getLogger("com.google.zxing");
logger.addHandler(new ServletContextLogHandler(servletConfig.getServletContext())); ServletContext context = servletConfig.getServletContext();
diskFileItemFactory = new DiskFileItemFactory(); logger.addHandler(new ServletContextLogHandler(context));
File repository = (File) context.getAttribute("javax.servlet.context.tempdir");
FileCleaningTracker fileCleaningTracker = FileCleanerCleanup.getFileCleaningTracker(context);
diskFileItemFactory = new DiskFileItemFactory(1 << 16, repository);
diskFileItemFactory.setFileCleaningTracker(fileCleaningTracker);
} }
@Override @Override
@ -225,7 +232,7 @@ public final class DecodeServlet extends HttpServlet {
// Parse the request // Parse the request
try { try {
for (FileItem item : (List<FileItem>) upload.parseRequest(request)) { for (FileItem item : upload.parseRequest(request)) {
if (!item.isFormField()) { if (!item.isFormField()) {
if (item.getSize() <= MAX_IMAGE_SIZE) { if (item.getSize() <= MAX_IMAGE_SIZE) {
log.info("Decoding uploaded file"); log.info("Decoding uploaded file");

BIN
zxingorg/web/WEB-INF/lib/commons-fileupload-1.2.2.jar
View file

Binary file not shown.

BIN
zxingorg/web/WEB-INF/lib/commons-fileupload-1.3.jar Normal file
View file

Binary file not shown.

BIN
zxingorg/web/WEB-INF/lib/commons-lang-2.6.jar
View file

Binary file not shown.

BIN
zxingorg/web/WEB-INF/lib/commons-lang3-3.1.jar Normal file
View file

Binary file not shown.

1
zxingorg/web/WEB-INF/lib/commons-lang-LICENSE.txt → zxingorg/web/WEB-INF/lib/commons-lang3-LICENSE.txt
View file

@ -200,4 +200,3 @@
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.

2
zxingorg/web/w/decoderesult.jspx
View file

@ -20,7 +20,7 @@
com.google.zxing.Result, com.google.zxing.Result,
com.google.zxing.client.result.ResultParser, com.google.zxing.client.result.ResultParser,
com.google.zxing.client.result.ParsedResult, com.google.zxing.client.result.ParsedResult,
org.apache.commons.lang.StringEscapeUtils"/> org.apache.commons.lang3.StringEscapeUtils"/>
<jsp:declaration> <jsp:declaration>
private static String arrayToString(byte[] bytes) { private static String arrayToString(byte[] bytes) {
int length = bytes.length; int length = bytes.length;