Author: ningjiang
Date: Tue Jun 1 04:13:34 2010
New Revision: 949923
URL: http://svn.apache.org/viewvc?rev=949923&view=rev
Log:
CAMEL-2772 Fixed the multi part form issue of camel-jetty
Added:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
(with props)
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
camel/trunk/components/camel-jetty/pom.xml
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java?rev=949923&r1=949922&r2=949923&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
Tue Jun 1 04:13:34 2010
@@ -17,6 +17,8 @@
package org.apache.camel.component.http;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
@@ -37,6 +39,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
import org.apache.camel.StreamCache;
+import org.apache.camel.component.http.helper.CamelFileDataSource;
import org.apache.camel.component.http.helper.GZIPHelper;
import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.spi.HeaderFilterStrategy;
@@ -152,7 +155,7 @@ public class DefaultHttpBinding implemen
Object object = request.getAttribute(name);
if (object instanceof File) {
String fileName = request.getParameter(name);
- message.addAttachment(fileName, new DataHandler(new
FileDataSource((File)object),
FileTypeMap.getDefaultFileTypeMap().getContentType(fileName)));
+ message.addAttachment(fileName, new DataHandler(new
CamelFileDataSource((File)object, fileName)));
}
}
}
Added:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java?rev=949923&view=auto
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
(added)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
Tue Jun 1 04:13:34 2010
@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+package org.apache.camel.component.http.helper;
+
+import java.io.File;
+
+import javax.activation.FileDataSource;
+import javax.activation.FileTypeMap;
+
+public class CamelFileDataSource extends FileDataSource {
+ private String fileName;
+ private FileTypeMap typeMap;
+
+ public CamelFileDataSource(File file, String fileName) {
+ super(file);
+ this.fileName = fileName;
+ }
+
+ public String getContentType() {
+ if (typeMap == null) {
+ return
FileTypeMap.getDefaultFileTypeMap().getContentType(fileName);
+ } else {
+ return typeMap.getContentType(fileName);
+ }
+ }
+
+ public void setFileTypeMap(FileTypeMap map) {
+ typeMap = map;
+ }
+
+}
Propchange:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/pom.xml?rev=949923&r1=949922&r2=949923&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/pom.xml (original)
+++ camel/trunk/components/camel-jetty/pom.xml Tue Jun 1 04:13:34 2010
@@ -81,6 +81,12 @@
<artifactId>camel-spring</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax-mail-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- to allow Spring annotations (jmx) to be tested -->
<dependency>
<groupId>org.springframework</groupId>
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java?rev=949923&r1=949922&r2=949923&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
Tue Jun 1 04:13:34 2010
@@ -70,8 +70,13 @@ public class MultiPartFormTest extends C
assertEquals("Get a wrong attachement size", 1,
in.getAttachments().size());
// The file name is attachment id
DataHandler data = in.getAttachment("NOTICE.txt");
+
assertNotNull("Should get the DataHandle NOTICE.txt",
data);
assertEquals("Get a wrong content type", "text/plain",
data.getContentType());
+
+ assertTrue("We should get the data from the
DataHandle", data.getDataSource()
+ .getInputStream().available() > 0);
+
// The other form date can be get from the message
header
exchange.getOut().setBody(in.getHeader("comment"));
}
