added new query paramaters
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@77508 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
8ed6d6ac4f
commit
435ffea34b
|
@ -4,12 +4,7 @@
|
||||||
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
|
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
|
||||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
|
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
|
||||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
|
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
|
||||||
<classpathentry excluding="java/|resources/" kind="src" path="src/test"/>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
|
||||||
<attributes>
|
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
|
||||||
</attributes>
|
|
||||||
</classpathentry>
|
|
||||||
<classpathentry kind="output" path="target/classes"/>
|
<classpathentry kind="output" path="target/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||||
<project-modules id="moduleCoreId" project-version="1.5.0">
|
|
||||||
<wb-module deploy-name="uri-resolver">
|
<wb-module deploy-name="uri-resolver">
|
||||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test"/>
|
|
||||||
<property name="context-root" value="uri-resolver"/>
|
<property name="context-root" value="uri-resolver"/>
|
||||||
<property name="java-output-path" value="/uri-resolver/target/classes"/>
|
<property name="java-output-path" value="/uri-resolver/target/classes"/>
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|
|
@ -2,4 +2,7 @@
|
||||||
<Changeset component="org.gcube.data-transfer.uri-resolver.1-0-0" date="2012-04-19">
|
<Changeset component="org.gcube.data-transfer.uri-resolver.1-0-0" date="2012-04-19">
|
||||||
<Change>first release</Change>
|
<Change>first release</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
|
<Changeset component="org.gcube.data-transfer.uri-resolver.1-1-0" date="2012-07-09">
|
||||||
|
<Change>Added fileName and contentType parameters to SMP URI resolver</Change>
|
||||||
|
</Changeset>
|
||||||
</ReleaseNotes>
|
</ReleaseNotes>
|
2
pom.xml
2
pom.xml
|
@ -8,7 +8,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.gcube.data.transfer</groupId>
|
<groupId>org.gcube.data.transfer</groupId>
|
||||||
<artifactId>uri-resolver</artifactId>
|
<artifactId>uri-resolver</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.1.0-SNAPSHOT</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
|
@ -29,6 +29,10 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public class HttpResolver extends HttpServlet {
|
public class HttpResolver extends HttpServlet {
|
||||||
|
|
||||||
|
String uri =null;
|
||||||
|
String fileName =null;
|
||||||
|
String contentType =null;
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** The logger. */
|
/** The logger. */
|
||||||
|
@ -46,7 +50,7 @@ public class HttpResolver extends HttpServlet {
|
||||||
|
|
||||||
logger.info("The http session id is: " + request.getSession().getId());
|
logger.info("The http session id is: " + request.getSession().getId());
|
||||||
|
|
||||||
String uri = request.getParameter("smp-uri");
|
uri = request.getParameter("smp-uri");
|
||||||
|
|
||||||
if (uri == null || uri.equals("")) {
|
if (uri == null || uri.equals("")) {
|
||||||
logger.debug("URI not found");
|
logger.debug("URI not found");
|
||||||
|
@ -54,6 +58,21 @@ public class HttpResolver extends HttpServlet {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fileName = request.getParameter("fileName");
|
||||||
|
|
||||||
|
|
||||||
|
if (fileName == null || fileName.equals("")) {
|
||||||
|
logger.debug("fileName not found");
|
||||||
|
fileName = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
contentType = request.getParameter("contentType");
|
||||||
|
|
||||||
|
if (contentType == null || contentType.equals("")) {
|
||||||
|
logger.debug("contentType not found");
|
||||||
|
contentType = null;
|
||||||
|
}
|
||||||
|
|
||||||
uri = uri.replace(" ","+");//the char + is removed when the servlet is doing unescaping of the query paramenters, we just put it back
|
uri = uri.replace(" ","+");//the char + is removed when the servlet is doing unescaping of the query paramenters, we just put it back
|
||||||
|
|
||||||
logger.debug("URI = "+ uri);
|
logger.debug("URI = "+ uri);
|
||||||
|
@ -63,14 +82,18 @@ public class HttpResolver extends HttpServlet {
|
||||||
|
|
||||||
OutputStream out = response.getOutputStream();
|
OutputStream out = response.getOutputStream();
|
||||||
|
|
||||||
String name = "";//we don't need to put a name in the HEADER
|
if (fileName != null)
|
||||||
response.addHeader("content_name", name);
|
response.addHeader("content-disposition", "attachment; filename=" +fileName);
|
||||||
response.addHeader("Content-Name", name);
|
else
|
||||||
|
response.addHeader("content-disposition", "attachment; filename=fromStorageManager");
|
||||||
|
|
||||||
response.addHeader("content-disposition", "attachment; filename=" +name);
|
if (contentType!= null)
|
||||||
|
response.setContentType(contentType);
|
||||||
|
else
|
||||||
response.setContentType("unknown/unknown");
|
response.setContentType("unknown/unknown");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
URL url = new URL(null, uri, new URLStreamHandler() {
|
URL url = new URL(null, uri, new URLStreamHandler() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue