You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2011/04/04 10:54:54 UTC
svn commit: r1088512 - in
/incubator/clerezza/trunk/parent/rdf.web/rdf.web.core: pom.xml
src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
Author: reto
Date: Mon Apr 4 08:54:54 2011
New Revision: 1088512
URL: http://svn.apache.org/viewvc?rev=1088512&view=rev
Log:
CLEREZZA-484: trying to guess media-type if the FGormFilöe says "application/octet-stream"
Modified:
incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml
incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
Modified: incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml?rev=1088512&r1=1088511&r2=1088512&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml (original)
+++ incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml Mon Apr 4 08:54:54 2011
@@ -63,6 +63,10 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>permissiondescriptions</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>web.fileserver</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java?rev=1088512&r1=1088511&r2=1088512&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java (original)
+++ incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java Mon Apr 4 08:54:54 2011
@@ -19,6 +19,7 @@
*/
package org.apache.clerezza.rdf.web.core;
+import java.awt.MediaTracker;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.security.AccessController;
@@ -54,6 +55,8 @@ import org.apache.clerezza.rdf.core.acce
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Parser;
+import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
+import org.apache.clerezza.web.fileserver.util.MediaTypeGuesser;
/**
* Provides methods to GET, PUT, and POST an SCB graph over the web.
@@ -173,6 +176,12 @@ public class WebAccess {
if (mediaType == null) {
responseWithBadRequest("mime-type not specified");
}
+ if (mediaType.equals(MediaType.APPLICATION_OCTET_STREAM_TYPE)) {
+ MediaType guessedType = MediaTypeGuesser.getInstance().guessTypeForName(formFile.getFileName());
+ if (guessedType != null) {
+ mediaType = guessedType;
+ }
+ }
String graphName = getFirstTextParameterValue(form, "name", true);
if (graphName == null) {
responseWithBadRequest("graph name not specified");
@@ -186,6 +195,7 @@ public class WebAccess {
mode = "append";
}
InputStream is = new ByteArrayInputStream(graph);
+ SupportedFormat
Graph parsedGraph = parser.parse(is, mediaType.toString());
UriRef graphUri = new UriRef(graphName);
LockableMGraph mGraph;