Added icons for: .odt, .ods, .ott, .odg, .odp
Updated pom version at 6.11.0 git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@124528 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
2fe12b9bbe
commit
bd9966c5ac
|
@ -16,7 +16,7 @@ Author
|
||||||
Version and Release Date
|
Version and Release Date
|
||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
v. 6.11.0 January 2016
|
v. 6.11.1 February 2016
|
||||||
|
|
||||||
|
|
||||||
Description
|
Description
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
|
<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-11-1"
|
||||||
|
date="2016-02-24">
|
||||||
|
<Change>Added icons for: .odt, .ods, .ott, .odg, .odp
|
||||||
|
</Change>
|
||||||
|
</Changeset>
|
||||||
<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-11-0"
|
<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-11-0"
|
||||||
date="2016-01-20">
|
date="2016-01-20">
|
||||||
<Change>[Feature #1925] Added, new public link format:
|
<Change>[Feature #1925] Added, new public link format:
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>workspace-tree-widget</artifactId>
|
<artifactId>workspace-tree-widget</artifactId>
|
||||||
<version>6.11.0-SNAPSHOT</version>
|
<version>6.11.1-SNAPSHOT</version>
|
||||||
<name>gCube Workspace Tree Widget</name>
|
<name>gCube Workspace Tree Widget</name>
|
||||||
<description>
|
<description>
|
||||||
gCube Workspace Tree Widget.
|
gCube Workspace Tree Widget.
|
||||||
|
|
|
@ -4,58 +4,58 @@ import com.google.gwt.resources.client.ClientBundle;
|
||||||
import com.google.gwt.resources.client.ImageResource;
|
import com.google.gwt.resources.client.ImageResource;
|
||||||
|
|
||||||
public interface Icons extends ClientBundle {
|
public interface Icons extends ClientBundle {
|
||||||
|
|
||||||
@Source("icons/cloud-drive.png")
|
@Source("icons/cloud-drive.png")
|
||||||
ImageResource cloudDrive();
|
ImageResource cloudDrive();
|
||||||
|
|
||||||
@Source("icons/table.png")
|
@Source("icons/table.png")
|
||||||
ImageResource table();
|
ImageResource table();
|
||||||
|
|
||||||
@Source("icons/close.gif")
|
@Source("icons/close.gif")
|
||||||
ImageResource close();
|
ImageResource close();
|
||||||
|
|
||||||
@Source("icons/mime/gif.gif")
|
@Source("icons/mime/gif.gif")
|
||||||
ImageResource gif();
|
ImageResource gif();
|
||||||
|
|
||||||
@Source("icons/mime/pdf.gif")
|
@Source("icons/mime/pdf.gif")
|
||||||
ImageResource pdf();
|
ImageResource pdf();
|
||||||
|
|
||||||
@Source("icons/mime/jpeg.gif")
|
@Source("icons/mime/jpeg.gif")
|
||||||
ImageResource jpeg();
|
ImageResource jpeg();
|
||||||
|
|
||||||
@Source("icons/mime/png.gif")
|
@Source("icons/mime/png.gif")
|
||||||
ImageResource png();
|
ImageResource png();
|
||||||
|
|
||||||
@Source("icons/mime/tiff.gif")
|
@Source("icons/mime/tiff.gif")
|
||||||
ImageResource tiff();
|
ImageResource tiff();
|
||||||
|
|
||||||
@Source("icons/mime/svg.png")
|
@Source("icons/mime/svg.png")
|
||||||
ImageResource svg();
|
ImageResource svg();
|
||||||
|
|
||||||
@Source("icons/mime/xml.gif")
|
@Source("icons/mime/xml.gif")
|
||||||
ImageResource xml();
|
ImageResource xml();
|
||||||
|
|
||||||
@Source("icons/mime/ico_htm.gif")
|
@Source("icons/mime/ico_htm.gif")
|
||||||
ImageResource html();
|
ImageResource html();
|
||||||
|
|
||||||
@Source("icons/mime/doc.gif")
|
@Source("icons/mime/doc.gif")
|
||||||
ImageResource doc();
|
ImageResource doc();
|
||||||
|
|
||||||
@Source("icons/mime/txt.gif")
|
@Source("icons/mime/txt.gif")
|
||||||
ImageResource txt();
|
ImageResource txt();
|
||||||
|
|
||||||
@Source("icons/mime/movie.png")
|
@Source("icons/mime/movie.png")
|
||||||
ImageResource movie();
|
ImageResource movie();
|
||||||
|
|
||||||
@Source("icons/new-folder.png")
|
@Source("icons/new-folder.png")
|
||||||
ImageResource addFolder();
|
ImageResource addFolder();
|
||||||
|
|
||||||
@Source("icons/mime/deletefolder.jpg")
|
@Source("icons/mime/deletefolder.jpg")
|
||||||
ImageResource deleteFolder();
|
ImageResource deleteFolder();
|
||||||
|
|
||||||
@Source("icons/mime/delete.png")
|
@Source("icons/mime/delete.png")
|
||||||
ImageResource deleteItem();
|
ImageResource deleteItem();
|
||||||
|
|
||||||
@Source("icons/rename2.png")
|
@Source("icons/rename2.png")
|
||||||
ImageResource renameItem();
|
ImageResource renameItem();
|
||||||
|
|
||||||
|
@ -82,13 +82,13 @@ public interface Icons extends ClientBundle {
|
||||||
|
|
||||||
@Source("icons/mime/download.png")
|
@Source("icons/mime/download.png")
|
||||||
ImageResource download();
|
ImageResource download();
|
||||||
|
|
||||||
@Source("icons/mime/forward.png")
|
@Source("icons/mime/forward.png")
|
||||||
ImageResource separatorPath();
|
ImageResource separatorPath();
|
||||||
|
|
||||||
@Source("icons/mime/search16.png")
|
@Source("icons/mime/search16.png")
|
||||||
ImageResource search();
|
ImageResource search();
|
||||||
|
|
||||||
@Source("icons/mime/search.png")
|
@Source("icons/mime/search.png")
|
||||||
ImageResource search2();
|
ImageResource search2();
|
||||||
|
|
||||||
|
@ -103,10 +103,10 @@ public interface Icons extends ClientBundle {
|
||||||
|
|
||||||
@Source("icons/mime/togglelist.png")
|
@Source("icons/mime/togglelist.png")
|
||||||
ImageResource toggleList();
|
ImageResource toggleList();
|
||||||
|
|
||||||
@Source("icons/mime/togglegroup.png")
|
@Source("icons/mime/togglegroup.png")
|
||||||
ImageResource toggleGroup();
|
ImageResource toggleGroup();
|
||||||
|
|
||||||
@Source("icons/mime/toggleicon.png")
|
@Source("icons/mime/toggleicon.png")
|
||||||
ImageResource toggleIcon();
|
ImageResource toggleIcon();
|
||||||
|
|
||||||
|
@ -121,13 +121,13 @@ public interface Icons extends ClientBundle {
|
||||||
|
|
||||||
@Source("icons/report.png")
|
@Source("icons/report.png")
|
||||||
ImageResource report();
|
ImageResource report();
|
||||||
|
|
||||||
@Source("icons/timeseries.png")
|
@Source("icons/timeseries.png")
|
||||||
ImageResource timeSeries();
|
ImageResource timeSeries();
|
||||||
|
|
||||||
@Source("icons/document.png")
|
@Source("icons/document.png")
|
||||||
ImageResource documents();
|
ImageResource documents();
|
||||||
|
|
||||||
@Source("icons/mime/save.gif")
|
@Source("icons/mime/save.gif")
|
||||||
ImageResource save();
|
ImageResource save();
|
||||||
|
|
||||||
|
@ -142,10 +142,10 @@ public interface Icons extends ClientBundle {
|
||||||
|
|
||||||
@Source("icons/link.gif")
|
@Source("icons/link.gif")
|
||||||
ImageResource openUrl();
|
ImageResource openUrl();
|
||||||
|
|
||||||
@Source("icons/linkadd.png")
|
@Source("icons/linkadd.png")
|
||||||
ImageResource addUrl();
|
ImageResource addUrl();
|
||||||
|
|
||||||
@Source("icons/send.png")
|
@Source("icons/send.png")
|
||||||
ImageResource sendTo();
|
ImageResource sendTo();
|
||||||
|
|
||||||
|
@ -187,19 +187,31 @@ public interface Icons extends ClientBundle {
|
||||||
|
|
||||||
@Source("icons/paste.png")
|
@Source("icons/paste.png")
|
||||||
ImageResource paste();
|
ImageResource paste();
|
||||||
|
|
||||||
@Source("icons/icon-odp.gif")
|
@Source("icons/odp.png")
|
||||||
ImageResource odp();
|
ImageResource odp();
|
||||||
|
|
||||||
|
@Source("icons/odt.png")
|
||||||
|
ImageResource odt();
|
||||||
|
|
||||||
|
@Source("icons/ods.png")
|
||||||
|
ImageResource ods();
|
||||||
|
|
||||||
|
@Source("icons/odg.png")
|
||||||
|
ImageResource odg();
|
||||||
|
|
||||||
|
@Source("icons/ott.png")
|
||||||
|
ImageResource ott();
|
||||||
|
|
||||||
@Source("icons/refresh.gif")
|
@Source("icons/refresh.gif")
|
||||||
ImageResource refresh();
|
ImageResource refresh();
|
||||||
|
|
||||||
@Source("icons/loading.gif")
|
@Source("icons/loading.gif")
|
||||||
ImageResource loading();
|
ImageResource loading();
|
||||||
|
|
||||||
@Source("icons/loading-off.gif")
|
@Source("icons/loading-off.gif")
|
||||||
ImageResource loadingOff();
|
ImageResource loadingOff();
|
||||||
|
|
||||||
@Source("icons/loading2.gif")
|
@Source("icons/loading2.gif")
|
||||||
ImageResource loading2();
|
ImageResource loading2();
|
||||||
|
|
||||||
|
@ -226,112 +238,112 @@ public interface Icons extends ClientBundle {
|
||||||
|
|
||||||
@Source("icons/workflowtemplate.png")
|
@Source("icons/workflowtemplate.png")
|
||||||
ImageResource workflowTemplate();
|
ImageResource workflowTemplate();
|
||||||
|
|
||||||
@Source("icons/webdav.png")
|
@Source("icons/webdav.png")
|
||||||
ImageResource webDav();
|
ImageResource webDav();
|
||||||
|
|
||||||
@Source("icons/mail-reply.png")
|
@Source("icons/mail-reply.png")
|
||||||
ImageResource replyMail();
|
ImageResource replyMail();
|
||||||
|
|
||||||
@Source("icons/mail-reply-all.png")
|
@Source("icons/mail-reply-all.png")
|
||||||
ImageResource replyAllMail();
|
ImageResource replyAllMail();
|
||||||
|
|
||||||
@Source("icons/application-link.png")
|
@Source("icons/application-link.png")
|
||||||
ImageResource resourceLink();
|
ImageResource resourceLink();
|
||||||
|
|
||||||
@Source("icons/sharingFolder.png")
|
@Source("icons/sharingFolder.png")
|
||||||
ImageResource shareFolder();
|
ImageResource shareFolder();
|
||||||
|
|
||||||
@Source("icons/sharedFolder4.png")
|
@Source("icons/sharedFolder4.png")
|
||||||
ImageResource sharedFolder();
|
ImageResource sharedFolder();
|
||||||
|
|
||||||
@Source("icons/unSharingFolder.gif")
|
@Source("icons/unSharingFolder.gif")
|
||||||
ImageResource unShareFolder();
|
ImageResource unShareFolder();
|
||||||
|
|
||||||
@Source("icons/unShareUsers.png")
|
@Source("icons/unShareUsers.png")
|
||||||
ImageResource unShareUser();
|
ImageResource unShareUser();
|
||||||
|
|
||||||
@Source("icons/categorize2.png")
|
@Source("icons/categorize2.png")
|
||||||
ImageResource gridView();
|
ImageResource gridView();
|
||||||
|
|
||||||
@Source("icons/users.png")
|
@Source("icons/users.png")
|
||||||
ImageResource users();
|
ImageResource users();
|
||||||
|
|
||||||
@Source("icons/info-icon.png")
|
@Source("icons/info-icon.png")
|
||||||
ImageResource info();
|
ImageResource info();
|
||||||
|
|
||||||
@Source("icons/mime/csv.gif")
|
@Source("icons/mime/csv.gif")
|
||||||
ImageResource csv();
|
ImageResource csv();
|
||||||
|
|
||||||
@Source("icons/excel.gif")
|
@Source("icons/excel.gif")
|
||||||
ImageResource excel();
|
ImageResource excel();
|
||||||
|
|
||||||
@Source("icons/ppt.gif")
|
@Source("icons/ppt.gif")
|
||||||
ImageResource ppt();
|
ImageResource ppt();
|
||||||
|
|
||||||
@Source("icons/read.png")
|
@Source("icons/read.png")
|
||||||
ImageResource read();
|
ImageResource read();
|
||||||
|
|
||||||
@Source("icons/notread.png")
|
@Source("icons/notread.png")
|
||||||
ImageResource notread();
|
ImageResource notread();
|
||||||
|
|
||||||
@Source("icons/history.png")
|
@Source("icons/history.png")
|
||||||
ImageResource history();
|
ImageResource history();
|
||||||
|
|
||||||
@Source("icons/cut.png")
|
@Source("icons/cut.png")
|
||||||
ImageResource cut();
|
ImageResource cut();
|
||||||
|
|
||||||
@Source("icons/new_create.png")
|
@Source("icons/new_create.png")
|
||||||
ImageResource createNew();
|
ImageResource createNew();
|
||||||
|
|
||||||
@Source("icons/get-link.png")
|
@Source("icons/get-link.png")
|
||||||
ImageResource refreshFolder();
|
ImageResource refreshFolder();
|
||||||
|
|
||||||
@Source("icons/link-try.png")
|
@Source("icons/link-try.png")
|
||||||
ImageResource shareLink();
|
ImageResource shareLink();
|
||||||
|
|
||||||
|
|
||||||
@Source("icons/openURL.png")
|
@Source("icons/openURL.png")
|
||||||
ImageResource extLink();
|
ImageResource extLink();
|
||||||
|
|
||||||
@Source("icons/sharelink.png")
|
@Source("icons/sharelink.png")
|
||||||
ImageResource publicLink();
|
ImageResource publicLink();
|
||||||
|
|
||||||
// @Source("icons/user_trash_full.png")
|
// @Source("icons/user_trash_full.png")
|
||||||
@Source("icons/full_trash.png")
|
@Source("icons/full_trash.png")
|
||||||
ImageResource trash_full();
|
ImageResource trash_full();
|
||||||
|
|
||||||
// @Source("icons/user_trash.png")
|
// @Source("icons/user_trash.png")
|
||||||
@Source("icons/empty_trash.png")
|
@Source("icons/empty_trash.png")
|
||||||
ImageResource trash_empty();
|
ImageResource trash_empty();
|
||||||
|
|
||||||
@Source("icons/readonly.png")
|
@Source("icons/readonly.png")
|
||||||
ImageResource readonly();
|
ImageResource readonly();
|
||||||
|
|
||||||
@Source("icons/writeown.png")
|
@Source("icons/writeown.png")
|
||||||
ImageResource writeown();
|
ImageResource writeown();
|
||||||
|
|
||||||
@Source("icons/writeall.png")
|
@Source("icons/writeall.png")
|
||||||
ImageResource writeall();
|
ImageResource writeall();
|
||||||
|
|
||||||
@Source("icons/specialfolder2.png")
|
@Source("icons/specialfolder2.png")
|
||||||
ImageResource vreFolder();
|
ImageResource vreFolder();
|
||||||
|
|
||||||
@Source("icons/admin.png")
|
@Source("icons/admin.png")
|
||||||
ImageResource administrator();
|
ImageResource administrator();
|
||||||
|
|
||||||
@Source("icons/add_admin.png")
|
@Source("icons/add_admin.png")
|
||||||
ImageResource addAdmin();
|
ImageResource addAdmin();
|
||||||
|
|
||||||
@Source("icons/admin_keys.png")
|
@Source("icons/admin_keys.png")
|
||||||
ImageResource manageAdmin();
|
ImageResource manageAdmin();
|
||||||
|
|
||||||
@Source("icons/specialfolder2.png")
|
@Source("icons/specialfolder2.png")
|
||||||
ImageResource specialFolder();
|
ImageResource specialFolder();
|
||||||
|
|
||||||
@Source("icons/shareuser.png")
|
@Source("icons/shareuser.png")
|
||||||
ImageResource user();
|
ImageResource user();
|
||||||
|
|
||||||
@Source("icons/sharegroup.png")
|
@Source("icons/sharegroup.png")
|
||||||
ImageResource groupusers();
|
ImageResource groupusers();
|
||||||
|
|
||||||
|
@ -346,64 +358,64 @@ public interface Icons extends ClientBundle {
|
||||||
*/
|
*/
|
||||||
@Source("icons/aoneleft.png")
|
@Source("icons/aoneleft.png")
|
||||||
ImageResource selectedLeft();
|
ImageResource selectedLeft();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Source("icons/aoneright.png")
|
@Source("icons/aoneright.png")
|
||||||
ImageResource selectedRight();
|
ImageResource selectedRight();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Source("icons/amoreleft.png")
|
@Source("icons/amoreleft.png")
|
||||||
ImageResource allLeft();
|
ImageResource allLeft();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Source("icons/amoreright.png")
|
@Source("icons/amoreright.png")
|
||||||
ImageResource allRight();
|
ImageResource allRight();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Source("icons/recycle.png")
|
@Source("icons/recycle.png")
|
||||||
ImageResource recycle();
|
ImageResource recycle();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Source("icons/edit-permissions.png")
|
@Source("icons/edit-permissions.png")
|
||||||
ImageResource permissions();
|
ImageResource permissions();
|
||||||
|
|
||||||
@Source("icons/pencil16.png")
|
@Source("icons/pencil16.png")
|
||||||
ImageResource pencil();
|
ImageResource pencil();
|
||||||
|
|
||||||
@Source("icons/edit16.png")
|
@Source("icons/edit16.png")
|
||||||
ImageResource edit();
|
ImageResource edit();
|
||||||
|
|
||||||
@Source("icons/gcubeItem.jpeg")
|
@Source("icons/gcubeItem.jpeg")
|
||||||
ImageResource gcubeItem();
|
ImageResource gcubeItem();
|
||||||
|
|
||||||
@Source("icons/dvi.gif")
|
@Source("icons/dvi.gif")
|
||||||
ImageResource dvi();
|
ImageResource dvi();
|
||||||
|
|
||||||
@Source("icons/ps.gif")
|
@Source("icons/ps.gif")
|
||||||
ImageResource postscript();
|
ImageResource postscript();
|
||||||
|
|
||||||
@Source("icons/shell-script.png")
|
@Source("icons/shell-script.png")
|
||||||
ImageResource shell();
|
ImageResource shell();
|
||||||
|
|
||||||
@Source("icons/tex.png")
|
@Source("icons/tex.png")
|
||||||
ImageResource tex();
|
ImageResource tex();
|
||||||
|
|
||||||
@Source("icons/zip.gif")
|
@Source("icons/zip.gif")
|
||||||
ImageResource zip();
|
ImageResource zip();
|
||||||
|
|
||||||
@Source("icons/archive-icon.png")
|
@Source("icons/archive-icon.png")
|
||||||
ImageResource archive();
|
ImageResource archive();
|
||||||
|
|
||||||
@Source("icons/java.png")
|
@Source("icons/java.png")
|
||||||
ImageResource java();
|
ImageResource java();
|
||||||
|
|
||||||
|
@ -412,7 +424,7 @@ public interface Icons extends ClientBundle {
|
||||||
*/
|
*/
|
||||||
@Source("icons/hand.gif")
|
@Source("icons/hand.gif")
|
||||||
ImageResource hand();
|
ImageResource hand();
|
||||||
|
|
||||||
@Source("icons/about.png")
|
@Source("icons/about.png")
|
||||||
ImageResource about();
|
ImageResource about();
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Before Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
After Width: | Height: | Size: 443 B |
Binary file not shown.
After Width: | Height: | Size: 798 B |
Binary file not shown.
After Width: | Height: | Size: 777 B |
Binary file not shown.
After Width: | Height: | Size: 923 B |
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package org.gcube.portlets.user.workspace.server;
|
package org.gcube.portlets.user.workspace.server;
|
||||||
|
|
||||||
|
@ -64,16 +64,16 @@ public class DownloadServlet extends HttpServlet{
|
||||||
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
|
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
|
||||||
|
|
||||||
String itemId = req.getParameter("id");
|
String itemId = req.getParameter("id");
|
||||||
boolean viewContent = (req.getParameter("viewContent")==null)?false:req.getParameter("viewContent").equals("true");
|
boolean viewContent = req.getParameter("viewContent")==null?false:req.getParameter("viewContent").equals("true");
|
||||||
boolean isValidItem = (req.getParameter(ConstantsExplorer.VALIDATEITEM)==null)?false:req.getParameter(ConstantsExplorer.VALIDATEITEM).equals("true");
|
boolean isValidItem = req.getParameter(ConstantsExplorer.VALIDATEITEM)==null?false:req.getParameter(ConstantsExplorer.VALIDATEITEM).equals("true");
|
||||||
boolean urlRedirectOnError = (req.getParameter(ConstantsExplorer.REDIRECTONERROR)==null)?false:req.getParameter(ConstantsExplorer.REDIRECTONERROR).equals("true");
|
boolean urlRedirectOnError = req.getParameter(ConstantsExplorer.REDIRECTONERROR)==null?false:req.getParameter(ConstantsExplorer.REDIRECTONERROR).equals("true");
|
||||||
|
|
||||||
logger.trace("Input Params [id: "+itemId + ", viewContent: "+viewContent+", "+ConstantsExplorer.VALIDATEITEM +": " +isValidItem+", urlRedirectOnError:" +urlRedirectOnError+"]");
|
logger.trace("Input Params [id: "+itemId + ", viewContent: "+viewContent+", "+ConstantsExplorer.VALIDATEITEM +": " +isValidItem+", urlRedirectOnError:" +urlRedirectOnError+"]");
|
||||||
if(itemId==null || itemId.isEmpty()){
|
if(itemId==null || itemId.isEmpty()){
|
||||||
sendError(resp,HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Item id is null");
|
sendError(resp,HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Item id is null");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.trace("FILE DOWNLOAD REQUEST "+itemId);
|
logger.trace("FILE DOWNLOAD REQUEST "+itemId);
|
||||||
Workspace wa = null;
|
Workspace wa = null;
|
||||||
try {
|
try {
|
||||||
|
@ -84,12 +84,12 @@ public class DownloadServlet extends HttpServlet{
|
||||||
|
|
||||||
wa = WsUtil.getWorkspace(session);
|
wa = WsUtil.getWorkspace(session);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
||||||
if (e instanceof SessionExpiredException){
|
if (e instanceof SessionExpiredException){
|
||||||
sendErrorForStatus(resp, HttpServletResponse.SC_UNAUTHORIZED +": Session expired", HttpServletResponse.SC_UNAUTHORIZED);
|
sendErrorForStatus(resp, HttpServletResponse.SC_UNAUTHORIZED +": Session expired", HttpServletResponse.SC_UNAUTHORIZED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleError(urlRedirectOnError, req, resp, itemId, HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during workspace retrieving");
|
handleError(urlRedirectOnError, req, resp, itemId, HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during workspace retrieving");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ public class DownloadServlet extends HttpServlet{
|
||||||
|
|
||||||
WorkspaceItem item;
|
WorkspaceItem item;
|
||||||
try {
|
try {
|
||||||
|
|
||||||
item = wa.getItem(itemId);
|
item = wa.getItem(itemId);
|
||||||
if(isValidItem){ //ADDED 25/06/2013 - THIS CODE RETURN A SC_ACCEPT IS ITEM EXIST
|
if(isValidItem){ //ADDED 25/06/2013 - THIS CODE RETURN A SC_ACCEPT IS ITEM EXIST
|
||||||
String message = HttpServletResponse.SC_ACCEPTED+ ": The resource is available";
|
String message = HttpServletResponse.SC_ACCEPTED+ ": The resource is available";
|
||||||
|
@ -109,10 +109,10 @@ public class DownloadServlet extends HttpServlet{
|
||||||
logger.trace("response return: "+message);
|
logger.trace("response return: "+message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try{
|
try{
|
||||||
//ACCOUNTING
|
//ACCOUNTING
|
||||||
item.markAsRead(true);
|
item.markAsRead(true);
|
||||||
} catch (InternalErrorException e) {
|
} catch (InternalErrorException e) {
|
||||||
logger.error("Requested item "+itemId+" has thrown an internal error exception",e);
|
logger.error("Requested item "+itemId+" has thrown an internal error exception",e);
|
||||||
}
|
}
|
||||||
|
@ -124,7 +124,7 @@ public class DownloadServlet extends HttpServlet{
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (item.getType()) {
|
switch (item.getType()) {
|
||||||
|
|
||||||
case SHARED_FOLDER:
|
case SHARED_FOLDER:
|
||||||
case FOLDER:{
|
case FOLDER:{
|
||||||
try {
|
try {
|
||||||
|
@ -133,11 +133,11 @@ public class DownloadServlet extends HttpServlet{
|
||||||
resp.setContentType("application/zip");
|
resp.setContentType("application/zip");
|
||||||
resp = setContentLength(resp, tmpZip.length());
|
resp = setContentLength(resp, tmpZip.length());
|
||||||
OutputStream out = resp.getOutputStream();
|
OutputStream out = resp.getOutputStream();
|
||||||
|
|
||||||
FileInputStream fileTmpZip = new FileInputStream(tmpZip);
|
FileInputStream fileTmpZip = new FileInputStream(tmpZip);
|
||||||
IOUtils.copy(fileTmpZip, resp.getOutputStream());
|
IOUtils.copy(fileTmpZip, resp.getOutputStream());
|
||||||
fileTmpZip.close();
|
fileTmpZip.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
tmpZip.delete();
|
tmpZip.delete();
|
||||||
return;
|
return;
|
||||||
|
@ -152,30 +152,30 @@ public class DownloadServlet extends HttpServlet{
|
||||||
FolderItem folderItem = (FolderItem) item;
|
FolderItem folderItem = (FolderItem) item;
|
||||||
|
|
||||||
switch (folderItem.getFolderItemType()) {
|
switch (folderItem.getFolderItemType()) {
|
||||||
|
|
||||||
case REPORT_TEMPLATE:{
|
case REPORT_TEMPLATE:{
|
||||||
try{
|
try{
|
||||||
ReportTemplate reportTemplate = (ReportTemplate)folderItem;
|
ReportTemplate reportTemplate = (ReportTemplate)folderItem;
|
||||||
String extension = FilenameUtils.getExtension(item.getName());
|
String extension = FilenameUtils.getExtension(item.getName());
|
||||||
String itemName = item.getName();
|
String itemName = item.getName();
|
||||||
logger.trace("case REPORT_TEMPLATE extension is" +extension);
|
logger.trace("case REPORT_TEMPLATE extension is" +extension);
|
||||||
|
|
||||||
if(extension.compareToIgnoreCase(Extensions.REPORT_TEMPLATE.getName())!=0) //ADD EXTENSION?
|
if(extension.compareToIgnoreCase(Extensions.REPORT_TEMPLATE.getName())!=0) //ADD EXTENSION?
|
||||||
itemName = "." + Extensions.REPORT_TEMPLATE.getName();
|
itemName = "." + Extensions.REPORT_TEMPLATE.getName();
|
||||||
|
|
||||||
logger.trace("case REPORT_TEMPLATE itemName is" +extension);
|
logger.trace("case REPORT_TEMPLATE itemName is" +extension);
|
||||||
String contentDisposition = (viewContent)?"inline":"attachment";
|
String contentDisposition = viewContent?"inline":"attachment";
|
||||||
resp.setHeader( "Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
|
resp.setHeader( "Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
|
||||||
|
|
||||||
resp.setContentType("application/zip");
|
resp.setContentType("application/zip");
|
||||||
resp = setContentLength(resp, reportTemplate.getLength());
|
resp = setContentLength(resp, reportTemplate.getLength());
|
||||||
OutputStream out = resp.getOutputStream();
|
OutputStream out = resp.getOutputStream();
|
||||||
|
|
||||||
//MODIFIED 22-05-2013 CLOSE STREAM
|
//MODIFIED 22-05-2013 CLOSE STREAM
|
||||||
InputStream is = reportTemplate.getData();
|
InputStream is = reportTemplate.getData();
|
||||||
IOUtils.copy(is, resp.getOutputStream());
|
IOUtils.copy(is, resp.getOutputStream());
|
||||||
is.close();
|
is.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error("Error during external item sending "+itemId,e);
|
logger.error("Error during external item sending "+itemId,e);
|
||||||
|
@ -191,23 +191,23 @@ public class DownloadServlet extends HttpServlet{
|
||||||
String extension = FilenameUtils.getExtension(item.getName());
|
String extension = FilenameUtils.getExtension(item.getName());
|
||||||
String itemName = item.getName();
|
String itemName = item.getName();
|
||||||
logger.trace("case REPORT extension is" +extension);
|
logger.trace("case REPORT extension is" +extension);
|
||||||
|
|
||||||
if(extension.compareToIgnoreCase(Extensions.REPORT.getName())!=0) //ADD EXTENSION?
|
if(extension.compareToIgnoreCase(Extensions.REPORT.getName())!=0) //ADD EXTENSION?
|
||||||
itemName = "." + Extensions.REPORT.getName();
|
itemName = "." + Extensions.REPORT.getName();
|
||||||
|
|
||||||
logger.trace("case REPORT itemName is" +extension);
|
logger.trace("case REPORT itemName is" +extension);
|
||||||
String contentDisposition = (viewContent)?"inline":"attachment";
|
String contentDisposition = viewContent?"inline":"attachment";
|
||||||
resp.setHeader( "Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
|
resp.setHeader( "Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
|
||||||
|
|
||||||
resp.setContentType("application/zip");
|
resp.setContentType("application/zip");
|
||||||
resp = setContentLength(resp, report.getLength());
|
resp = setContentLength(resp, report.getLength());
|
||||||
OutputStream out = resp.getOutputStream();
|
OutputStream out = resp.getOutputStream();
|
||||||
|
|
||||||
//MODIFIED 22-05-2013 CLOSE STREAM
|
//MODIFIED 22-05-2013 CLOSE STREAM
|
||||||
InputStream is = report.getData();
|
InputStream is = report.getData();
|
||||||
IOUtils.copy(is, resp.getOutputStream());
|
IOUtils.copy(is, resp.getOutputStream());
|
||||||
is.close();
|
is.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error("Error during external item sending "+itemId,e);
|
logger.error("Error during external item sending "+itemId,e);
|
||||||
|
@ -219,23 +219,23 @@ public class DownloadServlet extends HttpServlet{
|
||||||
}
|
}
|
||||||
case EXTERNAL_PDF_FILE:
|
case EXTERNAL_PDF_FILE:
|
||||||
case EXTERNAL_FILE:{
|
case EXTERNAL_FILE:{
|
||||||
|
|
||||||
InputStream is = null;
|
InputStream is = null;
|
||||||
OutputStream out = null;
|
OutputStream out = null;
|
||||||
try{
|
try{
|
||||||
ExternalFile externalFile = (ExternalFile)folderItem;
|
ExternalFile externalFile = (ExternalFile)folderItem;
|
||||||
|
|
||||||
String mimeType = externalFile.getMimeType();
|
String mimeType = externalFile.getMimeType();
|
||||||
|
|
||||||
logger.trace("EXTERNAL_FILE DOWNLOAD FOR "+externalFile.getId());
|
logger.trace("EXTERNAL_FILE DOWNLOAD FOR "+externalFile.getId());
|
||||||
String contentDisposition = (viewContent)?"inline":"attachment";
|
String contentDisposition = viewContent?"inline":"attachment";
|
||||||
resp.setHeader("Content-Disposition", contentDisposition+"; filename=\"" + item.getName() + "\"" );
|
resp.setHeader("Content-Disposition", contentDisposition+"; filename=\"" + item.getName() + "\"" );
|
||||||
resp.setContentType(mimeType);
|
resp.setContentType(mimeType);
|
||||||
resp = setContentLength(resp, externalFile.getLength());
|
resp = setContentLength(resp, externalFile.getLength());
|
||||||
is = externalFile.getData();
|
is = externalFile.getData();
|
||||||
out = resp.getOutputStream();
|
out = resp.getOutputStream();
|
||||||
IOUtils.copy(is, out);
|
IOUtils.copy(is, out);
|
||||||
|
|
||||||
is.close();
|
is.close();
|
||||||
out.close();
|
out.close();
|
||||||
|
|
||||||
|
@ -248,14 +248,14 @@ public class DownloadServlet extends HttpServlet{
|
||||||
|
|
||||||
}
|
}
|
||||||
case EXTERNAL_IMAGE:{
|
case EXTERNAL_IMAGE:{
|
||||||
|
|
||||||
try{
|
try{
|
||||||
ExternalImage externalImage = (ExternalImage)folderItem;
|
ExternalImage externalImage = (ExternalImage)folderItem;
|
||||||
|
|
||||||
String mimeType = externalImage.getMimeType();
|
String mimeType = externalImage.getMimeType();
|
||||||
String itemName = MimeTypeUtil.getNameWithExtension(item.getName(), mimeType);
|
String itemName = MimeTypeUtil.getNameWithExtension(item.getName(), mimeType);
|
||||||
|
|
||||||
String contentDisposition = (viewContent)?"inline":"attachment";
|
String contentDisposition = viewContent?"inline":"attachment";
|
||||||
resp.setHeader( "Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
|
resp.setHeader( "Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
|
||||||
resp.setContentType(externalImage.getMimeType());
|
resp.setContentType(externalImage.getMimeType());
|
||||||
resp = setContentLength(resp, externalImage.getLength());
|
resp = setContentLength(resp, externalImage.getLength());
|
||||||
|
@ -263,7 +263,7 @@ public class DownloadServlet extends HttpServlet{
|
||||||
InputStream is = externalImage.getData();
|
InputStream is = externalImage.getData();
|
||||||
IOUtils.copy(is, out);
|
IOUtils.copy(is, out);
|
||||||
is.close();
|
is.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
return;
|
return;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -275,18 +275,18 @@ public class DownloadServlet extends HttpServlet{
|
||||||
case EXTERNAL_URL:{
|
case EXTERNAL_URL:{
|
||||||
try{
|
try{
|
||||||
ExternalUrl externalUrl = (ExternalUrl)folderItem;
|
ExternalUrl externalUrl = (ExternalUrl)folderItem;
|
||||||
|
|
||||||
String itemName = MimeTypeUtil.getNameWithExtension(externalUrl.getName(), "text/uri-list");
|
String itemName = MimeTypeUtil.getNameWithExtension(externalUrl.getName(), "text/uri-list");
|
||||||
String contentDisposition = (viewContent)?"inline":"attachment";
|
String contentDisposition = viewContent?"inline":"attachment";
|
||||||
resp.setHeader("Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
|
resp.setHeader("Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
|
||||||
resp.setContentType("text/uri-list");
|
resp.setContentType("text/uri-list");
|
||||||
resp = setContentLength(resp, externalUrl.getLength());
|
resp = setContentLength(resp, externalUrl.getLength());
|
||||||
|
|
||||||
//MODIFIED 22-05-2013 CLOSE STREAM
|
//MODIFIED 22-05-2013 CLOSE STREAM
|
||||||
StringReader sr = new StringReader(externalUrl.getUrl());
|
StringReader sr = new StringReader(externalUrl.getUrl());
|
||||||
OutputStream out = resp.getOutputStream();
|
OutputStream out = resp.getOutputStream();
|
||||||
IOUtils.copy(sr, out);
|
IOUtils.copy(sr, out);
|
||||||
|
|
||||||
sr.close();
|
sr.close();
|
||||||
out.close();
|
out.close();
|
||||||
return;
|
return;
|
||||||
|
@ -307,13 +307,13 @@ public class DownloadServlet extends HttpServlet{
|
||||||
handleError(urlRedirectOnError, req, resp, itemId, HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during data retrieving: "+e.getMessage());
|
handleError(urlRedirectOnError, req, resp, itemId, HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during data retrieving: "+e.getMessage());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//MODIFIED 22-05-2013 CLOSE STREAM
|
//MODIFIED 22-05-2013 CLOSE STREAM
|
||||||
OutputStream out = resp.getOutputStream();
|
OutputStream out = resp.getOutputStream();
|
||||||
StringReader sr = new StringReader(query.getQuery());
|
StringReader sr = new StringReader(query.getQuery());
|
||||||
IOUtils.copy(sr, out);
|
IOUtils.copy(sr, out);
|
||||||
sr.close();
|
sr.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -323,17 +323,17 @@ public class DownloadServlet extends HttpServlet{
|
||||||
TimeSeries ts = (TimeSeries)folderItem;
|
TimeSeries ts = (TimeSeries)folderItem;
|
||||||
File tmpZip = ZipUtil.zipTimeSeries(ts);
|
File tmpZip = ZipUtil.zipTimeSeries(ts);
|
||||||
|
|
||||||
String contentDisposition = (viewContent)?"inline":"attachment";
|
String contentDisposition = viewContent?"inline":"attachment";
|
||||||
resp.setHeader( "Content-Disposition", contentDisposition+"; filename=\"" + item.getName() + ".zip\"" );
|
resp.setHeader( "Content-Disposition", contentDisposition+"; filename=\"" + item.getName() + ".zip\"" );
|
||||||
resp.setContentType("application/zip");
|
resp.setContentType("application/zip");
|
||||||
resp = setContentLength(resp, tmpZip.length());
|
resp = setContentLength(resp, tmpZip.length());
|
||||||
|
|
||||||
//MODIFIED 22-05-2013 CLOSE STREAM
|
//MODIFIED 22-05-2013 CLOSE STREAM
|
||||||
OutputStream out = resp.getOutputStream();
|
OutputStream out = resp.getOutputStream();
|
||||||
FileInputStream fileTmpZip = new FileInputStream(tmpZip);
|
FileInputStream fileTmpZip = new FileInputStream(tmpZip);
|
||||||
IOUtils.copy(fileTmpZip, out);
|
IOUtils.copy(fileTmpZip, out);
|
||||||
fileTmpZip.close();
|
fileTmpZip.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
tmpZip.delete();
|
tmpZip.delete();
|
||||||
return;
|
return;
|
||||||
|
@ -357,13 +357,13 @@ public class DownloadServlet extends HttpServlet{
|
||||||
resp.setHeader( "Content-Disposition", "attachment; filename=\"" + item.getName() + ".zip\"" );
|
resp.setHeader( "Content-Disposition", "attachment; filename=\"" + item.getName() + ".zip\"" );
|
||||||
resp.setContentType("application/zip");
|
resp.setContentType("application/zip");
|
||||||
resp = setContentLength(resp, tmpZip.length());
|
resp = setContentLength(resp, tmpZip.length());
|
||||||
|
|
||||||
//MODIFIED 22-05-2013 CLOSE STREAM
|
//MODIFIED 22-05-2013 CLOSE STREAM
|
||||||
OutputStream out = resp.getOutputStream();
|
OutputStream out = resp.getOutputStream();
|
||||||
FileInputStream fileTmpZip = new FileInputStream(tmpZip);
|
FileInputStream fileTmpZip = new FileInputStream(tmpZip);
|
||||||
IOUtils.copy(fileTmpZip, out);
|
IOUtils.copy(fileTmpZip, out);
|
||||||
fileTmpZip.close();
|
fileTmpZip.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
tmpZip.delete();
|
tmpZip.delete();
|
||||||
}
|
}
|
||||||
|
@ -378,7 +378,7 @@ public class DownloadServlet extends HttpServlet{
|
||||||
InputStream is = document.getData();
|
InputStream is = document.getData();
|
||||||
IOUtils.copy(is, out);
|
IOUtils.copy(is, out);
|
||||||
is.close();
|
is.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
@ -393,10 +393,10 @@ public class DownloadServlet extends HttpServlet{
|
||||||
try{
|
try{
|
||||||
// Metadata document = (Metadata)item;
|
// Metadata document = (Metadata)item;
|
||||||
GCubeItem metadata = (GCubeItem) item; //Cast GCubeItem
|
GCubeItem metadata = (GCubeItem) item; //Cast GCubeItem
|
||||||
|
|
||||||
resp.setContentType("text/html");
|
resp.setContentType("text/html");
|
||||||
resp = setContentLength(resp, metadata.getLength());
|
resp = setContentLength(resp, metadata.getLength());
|
||||||
|
|
||||||
//MODIFIED 22-05-2013 CLOSE STREAM
|
//MODIFIED 22-05-2013 CLOSE STREAM
|
||||||
OutputStream out = resp.getOutputStream();
|
OutputStream out = resp.getOutputStream();
|
||||||
InputStream is = metadata.getData();
|
InputStream is = metadata.getData();
|
||||||
|
@ -415,11 +415,11 @@ public class DownloadServlet extends HttpServlet{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleError(urlRedirectOnError, req, resp, itemId,HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during data retrieving");
|
handleError(urlRedirectOnError, req, resp, itemId,HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during data retrieving");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method to manage HttpServletResponse content length also to big data
|
* Method to manage HttpServletResponse content length also to big data
|
||||||
* @param resp
|
* @param resp
|
||||||
|
@ -437,20 +437,20 @@ public class DownloadServlet extends HttpServlet{
|
||||||
}
|
}
|
||||||
return resp;
|
return resp;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void handleError(boolean urlRedirectOnError, HttpServletRequest req, HttpServletResponse resp, String itemId, String message) throws IOException{
|
protected void handleError(boolean urlRedirectOnError, HttpServletRequest req, HttpServletResponse resp, String itemId, String message) throws IOException{
|
||||||
|
|
||||||
logger.warn("Handle error occurred: "+message);
|
logger.warn("Handle error occurred: "+message);
|
||||||
logger.trace("urlRedirectOnError is active: "+urlRedirectOnError);
|
logger.trace("urlRedirectOnError is active: "+urlRedirectOnError);
|
||||||
if(urlRedirectOnError){
|
if(urlRedirectOnError){
|
||||||
urlRedirect(req, resp, itemId);
|
urlRedirect(req, resp, itemId);
|
||||||
}else
|
}else
|
||||||
sendError(resp,message);
|
sendError(resp,message);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void sendError(HttpServletResponse response, String message) throws IOException
|
protected void sendError(HttpServletResponse response, String message) throws IOException
|
||||||
{
|
{
|
||||||
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
|
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
|
||||||
HandlerResultMessage resultMessage = HandlerResultMessage.errorResult(message);
|
HandlerResultMessage resultMessage = HandlerResultMessage.errorResult(message);
|
||||||
logger.trace("error message: "+resultMessage);
|
logger.trace("error message: "+resultMessage);
|
||||||
|
@ -461,10 +461,10 @@ public class DownloadServlet extends HttpServlet{
|
||||||
logger.trace("response writed");
|
logger.trace("response writed");
|
||||||
response.flushBuffer();
|
response.flushBuffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void sendErrorForStatus(HttpServletResponse response, String message, int status) throws IOException
|
protected void sendErrorForStatus(HttpServletResponse response, String message, int status) throws IOException
|
||||||
{
|
{
|
||||||
response.setStatus(status);
|
response.setStatus(status);
|
||||||
HandlerResultMessage resultMessage = HandlerResultMessage.errorResult(message);
|
HandlerResultMessage resultMessage = HandlerResultMessage.errorResult(message);
|
||||||
logger.trace("error message: "+resultMessage);
|
logger.trace("error message: "+resultMessage);
|
||||||
|
@ -475,7 +475,7 @@ public class DownloadServlet extends HttpServlet{
|
||||||
logger.trace("response writed");
|
logger.trace("response writed");
|
||||||
response.flushBuffer();
|
response.flushBuffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void sendMessage(HttpServletResponse response, String message) throws IOException
|
protected void sendMessage(HttpServletResponse response, String message) throws IOException
|
||||||
{
|
{
|
||||||
response.setStatus(HttpServletResponse.SC_ACCEPTED);
|
response.setStatus(HttpServletResponse.SC_ACCEPTED);
|
||||||
|
@ -483,15 +483,15 @@ public class DownloadServlet extends HttpServlet{
|
||||||
response.getWriter().write(resultMessage.toString());
|
response.getWriter().write(resultMessage.toString());
|
||||||
response.flushBuffer();
|
response.flushBuffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void sendMessageResourceAvailable(HttpServletResponse response, String message) throws IOException
|
protected void sendMessageResourceAvailable(HttpServletResponse response, String message) throws IOException
|
||||||
{
|
{
|
||||||
response.setStatus(HttpServletResponse.SC_ACCEPTED);
|
response.setStatus(HttpServletResponse.SC_ACCEPTED);
|
||||||
HandlerResultMessage resultMessage = HandlerResultMessage.okResult(message);
|
HandlerResultMessage resultMessage = HandlerResultMessage.okResult(message);
|
||||||
response.getWriter().write(resultMessage.toString());
|
response.getWriter().write(resultMessage.toString());
|
||||||
response.flushBuffer();
|
response.flushBuffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void sendWarnMessage(HttpServletResponse response, String message) throws IOException
|
protected void sendWarnMessage(HttpServletResponse response, String message) throws IOException
|
||||||
{
|
{
|
||||||
response.setStatus(HttpServletResponse.SC_ACCEPTED);
|
response.setStatus(HttpServletResponse.SC_ACCEPTED);
|
||||||
|
@ -499,7 +499,7 @@ public class DownloadServlet extends HttpServlet{
|
||||||
response.getWriter().write(resultMessage.toString());
|
response.getWriter().write(resultMessage.toString());
|
||||||
response.flushBuffer();
|
response.flushBuffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void urlRedirect(HttpServletRequest req, HttpServletResponse response, String fakePath) throws IOException {
|
protected void urlRedirect(HttpServletRequest req, HttpServletResponse response, String fakePath) throws IOException {
|
||||||
|
|
||||||
String requestUrl = getRequestURL(req) +fakePath;
|
String requestUrl = getRequestURL(req) +fakePath;
|
||||||
|
@ -508,7 +508,7 @@ public class DownloadServlet extends HttpServlet{
|
||||||
response.sendRedirect(response.encodeRedirectURL(requestUrl));
|
response.sendRedirect(response.encodeRedirectURL(requestUrl));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getRequestURL(HttpServletRequest req) {
|
public static String getRequestURL(HttpServletRequest req) {
|
||||||
|
|
||||||
String scheme = req.getScheme(); // http
|
String scheme = req.getScheme(); // http
|
||||||
|
@ -523,7 +523,7 @@ public class DownloadServlet extends HttpServlet{
|
||||||
StringBuffer url = new StringBuffer();
|
StringBuffer url = new StringBuffer();
|
||||||
url.append(scheme).append("://").append(serverName);
|
url.append(scheme).append("://").append(serverName);
|
||||||
|
|
||||||
if ((serverPort != 80) && (serverPort != 443)) {
|
if (serverPort != 80 && serverPort != 443) {
|
||||||
url.append(":").append(serverPort);
|
url.append(":").append(serverPort);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -531,50 +531,50 @@ public class DownloadServlet extends HttpServlet{
|
||||||
logger.trace("omitted contextPath: "+contextPath);
|
logger.trace("omitted contextPath: "+contextPath);
|
||||||
// logger.trace("servletPath: "+servletPath);
|
// logger.trace("servletPath: "+servletPath);
|
||||||
// url.append(contextPath).append(servletPath);
|
// url.append(contextPath).append(servletPath);
|
||||||
|
|
||||||
// if (pathInfo != null) {
|
// if (pathInfo != null) {
|
||||||
// url.append(pathInfo);
|
// url.append(pathInfo);
|
||||||
// }
|
// }
|
||||||
// if (queryString != null) {
|
// if (queryString != null) {
|
||||||
// url.append("?").append(queryString);
|
// url.append("?").append(queryString);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
PortalUrlGroupGatewayProperty p = new PortalUrlGroupGatewayProperty();
|
PortalUrlGroupGatewayProperty p = new PortalUrlGroupGatewayProperty();
|
||||||
|
|
||||||
int lenght = p.getPath().length();
|
int lenght = p.getPath().length();
|
||||||
|
|
||||||
String groupgatewaypath = "/";
|
String groupgatewaypath = "/";
|
||||||
|
|
||||||
if(lenght>1){
|
if(lenght>1){
|
||||||
|
|
||||||
String lastChar = p.getPath().substring(lenght-1, lenght-1);
|
String lastChar = p.getPath().substring(lenght-1, lenght-1);
|
||||||
|
|
||||||
groupgatewaypath+= lastChar.compareTo("/")!=0?p.getPath()+"/":p.getPath();
|
groupgatewaypath+= lastChar.compareTo("/")!=0?p.getPath()+"/":p.getPath();
|
||||||
}
|
}
|
||||||
|
|
||||||
url.append(groupgatewaypath);
|
url.append(groupgatewaypath);
|
||||||
|
|
||||||
return url.toString();
|
return url.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|
||||||
InputStream is = null;
|
InputStream is = null;
|
||||||
|
|
||||||
logger.trace("start");
|
logger.trace("start");
|
||||||
|
|
||||||
// is = GCUBEStorage.getRemoteFile("/Home/test.user/Workspace3d660604-03ef-49eb-89c3-4c73f8a47914");
|
// is = GCUBEStorage.getRemoteFile("/Home/test.user/Workspace3d660604-03ef-49eb-89c3-4c73f8a47914");
|
||||||
|
|
||||||
try{
|
try{
|
||||||
|
|
||||||
Workspace ws = HomeLibrary.getHomeManagerFactory().getHomeManager().getHome("francesco.mangiacrapa").getWorkspace();
|
Workspace ws = HomeLibrary.getHomeManagerFactory().getHomeManager().getHome("francesco.mangiacrapa").getWorkspace();
|
||||||
//
|
//
|
||||||
// ExternalFile f = (ExternalFile) ws.getItem("907ce8ef-5c0b-4601-83ac-215d1f432f6b");
|
// ExternalFile f = (ExternalFile) ws.getItem("907ce8ef-5c0b-4601-83ac-215d1f432f6b");
|
||||||
|
|
||||||
WorkspaceItem wsItem = ws.getItem("907ce8ef-5c0b-4601-83ac-215d1f432f6b");
|
WorkspaceItem wsItem = ws.getItem("907ce8ef-5c0b-4601-83ac-215d1f432f6b");
|
||||||
|
|
||||||
|
|
||||||
logger.trace("metadata info recovered from HL: [ID: "+wsItem.getId() +", name: "+wsItem.getName()+"]");
|
logger.trace("metadata info recovered from HL: [ID: "+wsItem.getId() +", name: "+wsItem.getName()+"]");
|
||||||
|
|
||||||
FileOutputStream out = new FileOutputStream(new File("/tmp/bla"));
|
FileOutputStream out = new FileOutputStream(new File("/tmp/bla"));
|
||||||
|
@ -583,21 +583,21 @@ public class DownloadServlet extends HttpServlet{
|
||||||
// while ((len = is.read(buffer)) != -1) {
|
// while ((len = is.read(buffer)) != -1) {
|
||||||
// out.write(buffer, 0, len);
|
// out.write(buffer, 0, len);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
logger.trace("cast as external file");
|
logger.trace("cast as external file");
|
||||||
ExternalFile f = (ExternalFile) wsItem;
|
ExternalFile f = (ExternalFile) wsItem;
|
||||||
|
|
||||||
is = f.getData();
|
is = f.getData();
|
||||||
|
|
||||||
IOUtils.copy(is, out);
|
IOUtils.copy(is, out);
|
||||||
is.close();
|
is.close();
|
||||||
|
|
||||||
out.close();
|
out.close();
|
||||||
|
|
||||||
// logger.trace("Sleeping");
|
// logger.trace("Sleeping");
|
||||||
// Thread.sleep(20000);
|
// Thread.sleep(20000);
|
||||||
// logger.trace("Alive");
|
// logger.trace("Alive");
|
||||||
|
|
||||||
logger.trace("end");
|
logger.trace("end");
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
|
@ -31,9 +31,9 @@ public class ItemRetrieve {
|
||||||
|
|
||||||
// public static String DEFAULT_SCOPE = "/d4science.research-infrastructures.eu/gCubeApps"; //PRODUCTION
|
// public static String DEFAULT_SCOPE = "/d4science.research-infrastructures.eu/gCubeApps"; //PRODUCTION
|
||||||
public static String DEFAULT_SCOPE = "/gcube/devsec"; //DEV
|
public static String DEFAULT_SCOPE = "/gcube/devsec"; //DEV
|
||||||
public static String TEST_USER = "giancarlo.panichi";
|
public static String TEST_USER = "francesco.mangiacrapa";
|
||||||
// public static String ITEMID = "63832213-098d-42d1-8774-89b6349764c0"; //Activity T3.4 working drafts/T2-EC-IMAR-HO-14-015 iMarine Sustainability WP - Business Model tools.pdf
|
// public static String ITEMID = "63832213-098d-42d1-8774-89b6349764c0"; //Activity T3.4 working drafts/T2-EC-IMAR-HO-14-015 iMarine Sustainability WP - Business Model tools.pdf
|
||||||
public static String ITEMID = "79b2490b-43aa-40b0-98ec-e073cf7d4887";
|
// public static String ITEMID = "79b2490b-43aa-40b0-98ec-e073cf7d4887";
|
||||||
// d81d3a64-603f-4907-ae74-be8353211807
|
// d81d3a64-603f-4907-ae74-be8353211807
|
||||||
protected static Logger logger = Logger.getLogger(ItemRetrieve.class);
|
protected static Logger logger = Logger.getLogger(ItemRetrieve.class);
|
||||||
|
|
||||||
|
@ -48,14 +48,14 @@ public class ItemRetrieve {
|
||||||
Workspace ws = getWorkspace();
|
Workspace ws = getWorkspace();
|
||||||
|
|
||||||
|
|
||||||
// retrieveFirstLevel(ws, null);
|
retrieveFirstLevel(ws, null);
|
||||||
|
|
||||||
retrieveFirstLevel(ws, ITEMID);
|
// retrieveFirstLevel(ws, ITEMID);
|
||||||
|
|
||||||
System.out.println("get workspace -> OK");
|
System.out.println("get workspace -> OK");
|
||||||
WorkspaceItem item = ws.getItem(ITEMID);
|
// WorkspaceItem item = ws.getItem(ITEMID);
|
||||||
System.out.println("get item id: "+item.getId()+", name: "+item.getName() +", parent: "+item.getParent());
|
// System.out.println("get item id: "+item.getId()+", name: "+item.getName() +", parent: "+item.getParent());
|
||||||
System.out.println(item);
|
// System.out.println(item);
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
@ -100,9 +100,14 @@ public class ItemRetrieve {
|
||||||
startTime = System.currentTimeMillis();
|
startTime = System.currentTimeMillis();
|
||||||
System.out.println("Start foundFolder at time: "+startTime);
|
System.out.println("Start foundFolder at time: "+startTime);
|
||||||
// WorkspaceItem root = ws.getItem(ITEMID);
|
// WorkspaceItem root = ws.getItem(ITEMID);
|
||||||
WorkspaceItem fd = ws.getItem(foundFolder);
|
WorkspaceItem fd;
|
||||||
System.out.println("foundFolder id: "+foundFolder);
|
if(foundFolder!=null){
|
||||||
System.out.println("start get children");
|
fd = ws.getItem(foundFolder);
|
||||||
|
System.out.println("foundFolder id: "+foundFolder);
|
||||||
|
System.out.println("start get children");
|
||||||
|
}else
|
||||||
|
fd = ws.getRoot();
|
||||||
|
|
||||||
List<? extends WorkspaceItem> children = fd.getChildren();
|
List<? extends WorkspaceItem> children = fd.getChildren();
|
||||||
System.out.println("tree getChildren() returning "+children.size()+" elements in " + time);
|
System.out.println("tree getChildren() returning "+children.size()+" elements in " + time);
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package org.gcube.portlets.user.workspace;
|
package org.gcube.portlets.user.workspace;
|
||||||
|
|
||||||
import java.io.BufferedInputStream;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
|
@ -22,7 +21,6 @@ import org.gcube.common.homelibrary.home.workspace.exceptions.ItemAlreadyExistEx
|
||||||
import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException;
|
import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException;
|
||||||
import org.gcube.common.homelibrary.home.workspace.exceptions.WrongDestinationException;
|
import org.gcube.common.homelibrary.home.workspace.exceptions.WrongDestinationException;
|
||||||
import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
|
import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
|
||||||
import org.gcube.common.homelibrary.util.MimeTypeUtil;
|
|
||||||
import org.gcube.common.homelibrary.util.WorkspaceUtil;
|
import org.gcube.common.homelibrary.util.WorkspaceUtil;
|
||||||
import org.gcube.common.scope.api.ScopeProvider;
|
import org.gcube.common.scope.api.ScopeProvider;
|
||||||
import org.gcube.common.scope.impl.ScopeBean;
|
import org.gcube.common.scope.impl.ScopeBean;
|
||||||
|
@ -30,7 +28,7 @@ import org.gcube.common.scope.impl.ScopeBean;
|
||||||
/**
|
/**
|
||||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||||
* @Jun 20, 2013
|
* @Jun 20, 2013
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class UploadServletTest {
|
public class UploadServletTest {
|
||||||
|
|
||||||
|
@ -48,7 +46,7 @@ public class UploadServletTest {
|
||||||
|
|
||||||
String filePath = "/home/francesco-mangiacrapa";
|
String filePath = "/home/francesco-mangiacrapa";
|
||||||
|
|
||||||
String fileName = "ASFIS 6 languages_2013.csv";
|
String fileName = "Geo Explorer 2016-01-15 18-51-51.png";
|
||||||
|
|
||||||
String fullPath = filePath + "/" + fileName;
|
String fullPath = filePath + "/" + fileName;
|
||||||
|
|
||||||
|
@ -65,16 +63,16 @@ public class UploadServletTest {
|
||||||
// ExternalImage file = (ExternalImage) root.find(name);
|
// ExternalImage file = (ExternalImage) root.find(name);
|
||||||
|
|
||||||
// UPLOAD FILE
|
// UPLOAD FILE
|
||||||
String contentType = MimeTypeUtil.getMimeType(fileName, new BufferedInputStream(
|
// String contentType = MimeTypeUtil.getMimeType(fileName, new BufferedInputStream(
|
||||||
new FileInputStream(new File(fullPath))));
|
// new FileInputStream(new File(fullPath))));
|
||||||
|
|
||||||
String itemName = WorkspaceUtil.getUniqueName(fileName, root);
|
String itemName = WorkspaceUtil.getUniqueName(fileName, root);
|
||||||
System.out.println("Storing data....");
|
System.out.println("Storing data....");
|
||||||
System.out.println("content type " + contentType);
|
System.out.println("content type " + null);
|
||||||
System.out.println("itemName " + itemName);
|
System.out.println("itemName " + itemName);
|
||||||
|
|
||||||
ExternalFile file = (ExternalFile) WorkspaceUtil.createExternalFile(
|
ExternalFile file = (ExternalFile) WorkspaceUtil.createExternalFile(
|
||||||
root, itemName, "", contentType, new FileInputStream(new File(
|
root, itemName, "", null, new FileInputStream(new File(
|
||||||
fullPath)));
|
fullPath)));
|
||||||
|
|
||||||
System.out.println("Storing data - OK" + "File [id: " + file.getId()
|
System.out.println("Storing data - OK" + "File [id: " + file.getId()
|
||||||
|
@ -95,7 +93,7 @@ public class UploadServletTest {
|
||||||
InputStream inputStream = file.getData();
|
InputStream inputStream = file.getData();
|
||||||
// write the inputStream to a FileOutputStream
|
// write the inputStream to a FileOutputStream
|
||||||
OutputStream out = new FileOutputStream(new File(
|
OutputStream out = new FileOutputStream(new File(
|
||||||
"/home/francesco-mangiacrapa/Desktop/result"));
|
"/home/francesco-mangiacrapa/Desktop/download/"+fileName));
|
||||||
|
|
||||||
int read = 0;
|
int read = 0;
|
||||||
byte[] bytes = new byte[1024];
|
byte[] bytes = new byte[1024];
|
||||||
|
|
Loading…
Reference in New Issue