Author: yurize
Date: Fri Oct 21 22:33:51 2011
New Revision: 1187583
URL: http://svn.apache.org/viewvc?rev=1187583&view=rev
Log:
Adds fotgotten file from previous commit + small fix
Modified:
incubator/wave/trunk/build.xml
incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/AttachmentServlet.java
Modified: incubator/wave/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/build.xml?rev=1187583&r1=1187582&r2=1187583&view=diff
==============================================================================
--- incubator/wave/trunk/build.xml (original)
+++ incubator/wave/trunk/build.xml Fri Oct 21 22:33:51 2011
@@ -512,6 +512,7 @@
</fileset>
<fileset dir="${lib.codegen}">
<include name="gwt/gwt-user.jar"/>
+ <include name="gwt/gwt-dev.jar"/>
</fileset>
</unzip>
<copy todir="${staging.dir}" preservelastmodified="true">
@@ -601,9 +602,11 @@
<include name="org/apache/commons/codec/**/*" />
<include name="org/apache/commons/collections/**/*" />
<include name="org/apache/commons/configuration/**/*" />
+ <include name="org/apache/commons/fileupload/**/*" />
<include name="org/apache/commons/httpclient/**/*" />
<include name="org/apache/commons/lang/**/*" />
<include name="org/apache/commons/logging/**/*" />
+ <include name="org/apache/commons/io/**/*" />
<include name="org/bson/**/*" />
<include name="org/codehaus/jackson/**/*" />
<include name="org/dom4j/**/*" />
Modified:
incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/AttachmentServlet.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/AttachmentServlet.java?rev=1187583&r1=1187582&r2=1187583&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/AttachmentServlet.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/AttachmentServlet.java
Fri Oct 21 22:33:51 2011
@@ -20,8 +20,6 @@ package org.waveprotocol.box.server.rpc;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import com.sun.istack.internal.Nullable;
-
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -100,7 +98,6 @@ public class AttachmentServlet extends H
return fileName != null ? fileName : "";
}
- @Nullable
private static WaveletName waveRef2WaveletName(String waveRefStr) {
WaveRef waveRef = null;
try {
