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

removed blank lines 

bug fixing Incident #16285
updated pom version at 2.0.1

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@178628 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2019-03-19 15:12:48 +00:00
parent a7eb76132c
commit 9c56428d32
8 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -11,11 +11,13 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">

1
.settings/org.eclipse.jdt.core.prefs
View File

@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.7

7
.settings/org.eclipse.wst.common.project.facet.core.prefs.xml Normal file
View File

@ -0,0 +1,7 @@
<root>
<facet id="jst.jaxrs">
<node name="libprov">
<attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
</node>
</facet>
</root>

1
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -5,4 +5,5 @@
<installed facet="jst.web" version="2.3"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="liferay.portlet" version="6.0"/>
<installed facet="jst.jaxrs" version="2.0"/>
</faceted-project>

39
distro/changelog.xml
View File

@ -1,10 +1,18 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.2-0-1"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.2-0-2"
date="${buildDate}">
<Change>[Incident #16285] Bug fixing
</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.2-0-1"
date="${buildDate}">
<Change>[Bug #13232] Fixing it
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.2-0-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.2-0-0"
date="2018-09-19">
<Change>[Feature #11722] Workspace Uploader - Update to StorageHUB
</Change>
@ -15,7 +23,8 @@
drag and drop facility on Windows Operating System
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-8-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-8-0"
date="2017-03-27">
<Change>[Task #7820] DaD and Browse: create new version of existing
items added
@ -25,40 +34,48 @@
completed
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-7-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-7-0"
date="2017-02-23">
<Change>Removed currUserId parameter from client-side</Change>
<Change>[Feature #6153] Improve error messages</Change>
<Change>Integrated with file versioning</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-6-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-6-0"
date="2016-12-01">
<Change>Feature #5901 Remove ASL Dependency from workspace-uploader
Widget
</Change>
<Change>Bug #6096 Fixed</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-4-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-4-0"
date="2016-05-31">
<Change>[Feature #4128] Migration to Liferay 6.2</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-3-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-3-0"
date="2016-05-18">
<Change>[Feature #4055] DnD multiple instances</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-2-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-2-0"
date="2016-05-09">
<Change>[Feature #3962] Sequential upload status</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-1-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-1-0"
date="2016-01-08">
<Change>Bug Fixed #1333</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-0-1"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-0-1"
date="2015-12-16">
<Change>Bug Fixed - https://support.d4science.org/issues/1824</Change>
</Changeset>
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-0-0"
<Changeset
component="org.gcube.portlets-widgets.workspace-uploader.1-0-0"
date="2015-08-07">
<Change>first release</Change>
</Changeset>

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>workspace-uploader</artifactId>
<packaging>jar</packaging>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
<name>Workspace Uploader Widget</name>
<description>Workspace Uploader Widget allows your application to upload file/s in the gCube Workspace</description>
<scm>

8
src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploader.java
View File

@ -60,21 +60,15 @@ public class NotificationsWorkspaceUploader {
try{
if(folderDestinationItem.isShared()){ //Notify Added Item To Sharing?
//TODO folderDestinationItem.getIdSharedFolder()
logger.trace("checkNotifyAddItemToShare source item: "+sourceItem.getName()+" sourceSharedId: "+sourceSharedId + " folder destination name: "+folderDestinationItem.getName() + " folder destination id: "+folderDestinationItem.getId());
//share condition is true if source shared folder is not null
boolean shareChangeCondition = sourceSharedId==null?false:true;
//System.out.println("shareChangeCondition add item: "+ shareChangeCondition);
logger.trace("shareChangeCondition add item: "+shareChangeCondition);
//if shareChangeCondition is true.. notifies added item to sharing
if(shareChangeCondition){
SharedFolder folderDest = (SharedFolder) folderDestinationItem;
FolderItem folderDest = (FolderItem) folderDestinationItem;
SharedFolder rootSharedFolder = null;
try{
FolderItem sharedFolder = storageWrapper.getStorageHubClientService().getRootSharedFolder(folderDest.getId());

5
src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploaderProducer.java
View File

@ -126,11 +126,8 @@ public class NotificationsWorkspaceUploaderProducer {
try{
//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
if(infoContactModel.getLogin().compareTo(username)!=0){
logger.info("Sending notification to user "+infoContactModel.getLogin() +" added item "+socialItem.getName()+" in shared folder "+socialSharedFolder.getName());
boolean notify = notificationsMng.notifyAddedItem(infoContactModel.getLogin(), socialItem, socialSharedFolder);
if(!notify){
logger.error("An error occured when notify user: "+infoContactModel.getLogin());
}
@ -165,11 +162,9 @@ public class NotificationsWorkspaceUploaderProducer {
try{
//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
if(infoContactModel.getLogin().compareTo(username)!=0){
//TODO notificationsMng.notifyUpdatedItem(infoContactModel.getLogin(), workspaceItem, sharedFolder);
logger.info("Sending notification to user "+infoContactModel.getLogin() +" updated item "+socialItem.getName()+" in shared folder "+socialSharedFolder.getName());
boolean notify = notificationsMng.notifyUpdatedItem(infoContactModel.getLogin(), socialItem, socialSharedFolder);
if(!notify){
logger.error("An error updated when notify user: "+infoContactModel.getLogin());
}