gCubeSystem
/
workspace-uploader
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

429: Workspace: uploading big files 

Task-Url: https://support.d4science.org/issues/429

Removed unused code

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@119361 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-10-02 16:34:49 +00:00
parent 98f8bcb2d6
commit 945030861f
7 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -6,6 +6,7 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" 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">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>

1
.settings/org.eclipse.wst.common.component
View File

@ -3,6 +3,7 @@
<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"/>
<property name="context-root" value="workspace-uploader"/> <property name="context-root" value="workspace-uploader"/>
<property name="java-output-path" value="/workspace-uploader-TRUNK/target/workspace-uploader-1.0.0-SNAPSHOT/WEB-INF/classes"/> <property name="java-output-path" value="/workspace-uploader-TRUNK/target/workspace-uploader-1.0.0-SNAPSHOT/WEB-INF/classes"/>
</wb-module> </wb-module>

2
src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/WorkspaceUploadNotification.java
View File

@ -33,7 +33,7 @@ public class WorkspaceUploadNotification {
* @param parentID the parent id * @param parentID the parent id
* @param itemId the item id * @param itemId the item id
*/ */
void onUploadCompleted(String parentID, String itemId); void onUploadCompleted(String parentId, String itemId);
/** /**
* On upload aborted. * On upload aborted.

3
src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUploadStream.java
View File

@ -17,6 +17,7 @@ import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Anchor;
@ -209,7 +210,7 @@ public class DialogUploadStream extends ClosableDialog implements HasWorskpaceUp
GWT.log("SubmitEvent"); GWT.log("SubmitEvent");
addLoading(); addLoading();
enableButtons(false); enableButtons(false);
WorkspaceUploaderItem fakeUploader = new WorkspaceUploaderItem(); final WorkspaceUploaderItem fakeUploader = new WorkspaceUploaderItem();
fakeUploader.setClientUploadKey(clientUploadKey); fakeUploader.setClientUploadKey(clientUploadKey);
UploaderMonitor.getInstance().addNewSubmit(fakeUploader, fileUpload.getFilename()); UploaderMonitor.getInstance().addNewSubmit(fakeUploader, fileUpload.getFilename());
setVisible(false); setVisible(false);

21
src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUploadStream.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import org.gcube.portlets.widgets.workspaceuploader.client.ConstantsWorkspaceUploader; import org.gcube.portlets.widgets.workspaceuploader.client.ConstantsWorkspaceUploader;
import org.gcube.portlets.widgets.workspaceuploader.client.DialogResult; import org.gcube.portlets.widgets.workspaceuploader.client.DialogResult;
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.HasWorskpaceUploadNotificationListener;
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener;
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploaderServiceAsync; import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploaderServiceAsync;
import org.gcube.portlets.widgets.workspaceuploader.shared.HandlerResultMessage; import org.gcube.portlets.widgets.workspaceuploader.shared.HandlerResultMessage;
@ -326,24 +327,4 @@ public class MultipleDilaogUploadStream extends DialogUploadStream {
} }
return out; return out;
}-*/; }-*/;
/* (non-Javadoc)
* @see org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.HasWorskpaceUploadNotificationListener#addWorkspaceUploadNotificationListener(org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener)
*/
@Override
public void addWorkspaceUploadNotificationListener(
WorskpaceUploadNotificationListener handler) {
// TODO Auto-generated method stub
}
/* (non-Javadoc)
* @see org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.HasWorskpaceUploadNotificationListener#removeWorkspaceUploadNotificationListener(org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener)
*/
@Override
public void removeWorkspaceUploadNotificationListener(
WorskpaceUploadNotificationListener handler) {
// TODO Auto-generated method stub
}
} }

12
src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderMonitor.java
View File

@ -155,21 +155,21 @@ public class UploaderMonitor {
/** /**
* Poll workspace uploader. * Poll workspace uploader.
* *
* @param workspaceUploaderItem the workspace uploader item * @param workspaceUploader the workspace uploader item
*/ */
public void pollWorkspaceUploader(final WorkspaceUploaderItem workspaceUploaderItem){ public void pollWorkspaceUploader(final WorkspaceUploaderItem workspaceUploader){
Timer timer = new Timer() { Timer timer = new Timer() {
@Override @Override
public void run() { public void run() {
WorkspaceUploaderServiceAsync.Util.getInstance().getUploadStatus(workspaceUploaderItem.getClientUploadKey(), new AsyncCallback<WorkspaceUploaderItem>() { WorkspaceUploaderServiceAsync.Util.getInstance().getUploadStatus(workspaceUploader.getClientUploadKey(), new AsyncCallback<WorkspaceUploaderItem>() {
@Override @Override
public void onSuccess(WorkspaceUploaderItem result) { public void onSuccess(WorkspaceUploaderItem result) {
// GWT.log("onSuccess: "+result.toString()); // GWT.log("onSuccess: "+result.toString());
synchronized(this){ synchronized(this){
Timer tmn = mapTimer.get(workspaceUploaderItem); Timer tmn = mapTimer.get(workspaceUploader.getClientUploadKey());
if(tmn!=null && tmn.isRunning()){ if(tmn!=null && tmn.isRunning()){
if(result.getUploadStatus().equals(UPLOAD_STATUS.COMPLETED)){ if(result.getUploadStatus().equals(UPLOAD_STATUS.COMPLETED)){
mapTimer.remove(tmn); mapTimer.remove(tmn);
@ -194,14 +194,14 @@ public class UploaderMonitor {
@Override @Override
public void onFailure(Throwable caught) { public void onFailure(Throwable caught) {
GWT.log("onFailure: "+caught.getMessage()); GWT.log("onFailure: "+caught.getMessage());
notifyUploadError(workspaceUploaderItem.getFile().getParentId(), null, caught); notifyUploadError(workspaceUploader.getFile().getParentId(), null, caught);
cancel(); cancel();
} }
}); });
} }
}; };
mapTimer.put(workspaceUploaderItem.getClientUploadKey(), timer); mapTimer.put(workspaceUploader.getClientUploadKey(), timer);
timer.scheduleRepeating(2000); timer.scheduleRepeating(2000);
} }

8
src/main/webapp/WEB-INF/web.xml
View File

@ -16,8 +16,8 @@
<servlet-name>workspaceUploadServlet</servlet-name> <servlet-name>workspaceUploadServlet</servlet-name>
<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploadServlet</servlet-class> <servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploadServlet</servlet-class>
</servlet> </servlet>
<!-- Servlets --> <!-- Servlets -->
<servlet> <servlet>
<servlet-name>workspaceUploadServletStream</servlet-name> <servlet-name>workspaceUploadServletStream</servlet-name>
@ -33,8 +33,8 @@
<servlet-name>workspaceUploadServlet</servlet-name> <servlet-name>workspaceUploadServlet</servlet-name>
<url-pattern>/workspaceuploader/workspaceUploadServlet</url-pattern> <url-pattern>/workspaceuploader/workspaceUploadServlet</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>workspaceUploadServletStream</servlet-name> <servlet-name>workspaceUploadServletStream</servlet-name>
<url-pattern>/workspaceuploader/workspaceUploadServletStream</url-pattern> <url-pattern>/workspaceuploader/workspaceUploadServletStream</url-pattern>
</servlet-mapping> </servlet-mapping>