add rootFolderId as parameter
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/ws-thredds-sync-widget@165495 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
f68786adb8
commit
f0e4af3c06
|
@ -284,6 +284,7 @@ public class WsThreddsWidgetViewManager {
|
||||||
conf.setRemotePath(remotePath);
|
conf.setRemotePath(remotePath);
|
||||||
conf.setCatalogName(catalogueSelected.getName());
|
conf.setCatalogName(catalogueSelected.getName());
|
||||||
conf.setSelectedScope(getSelectedScope());
|
conf.setSelectedScope(getSelectedScope());
|
||||||
|
conf.setRootFolderId(folder.getFolderId());
|
||||||
WsThreddsWidget.eventBus.fireEvent(new PerformDoSyncEvent(folder, conf));
|
WsThreddsWidget.eventBus.fireEvent(new PerformDoSyncEvent(folder, conf));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,12 @@ public class BeanConverter {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To scope title.
|
||||||
|
*
|
||||||
|
* @param scope the scope
|
||||||
|
* @return the string
|
||||||
|
*/
|
||||||
public static String toScopeTitle(String scope){
|
public static String toScopeTitle(String scope){
|
||||||
|
|
||||||
if(scope==null || scope.isEmpty())
|
if(scope==null || scope.isEmpty())
|
||||||
|
@ -98,14 +104,16 @@ public class BeanConverter {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To th synch folder configuration.
|
* To th synch folder configuration.
|
||||||
*
|
*
|
||||||
* @param t the t
|
* @param t the t
|
||||||
|
* @param rootFolderId the root folder id
|
||||||
* @param targetScopeUserToken the target scope user token
|
* @param targetScopeUserToken the target scope user token
|
||||||
* @return the th synch folder configuration
|
* @return the th synch folder configuration
|
||||||
*/
|
*/
|
||||||
public static ThSynchFolderConfiguration toThSynchFolderConfiguration(WsThreddsSynchFolderConfiguration t, String targetScopeUserToken) {
|
public static ThSynchFolderConfiguration toThSynchFolderConfiguration(WsThreddsSynchFolderConfiguration t, String rootFolderId, String targetScopeUserToken) {
|
||||||
|
|
||||||
if(t==null)
|
if(t==null)
|
||||||
return null;
|
return null;
|
||||||
|
@ -115,6 +123,7 @@ public class BeanConverter {
|
||||||
ts.setRemotePath(t.getRemotePath());
|
ts.setRemotePath(t.getRemotePath());
|
||||||
ts.setTargetToken(targetScopeUserToken);
|
ts.setTargetToken(targetScopeUserToken);
|
||||||
ts.setToCreateCatalogName(t.getCatalogName());
|
ts.setToCreateCatalogName(t.getCatalogName());
|
||||||
|
ts.setRootFolderId(rootFolderId);
|
||||||
return ts;
|
return ts;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -99,7 +99,7 @@ public class ThreddsWorkspaceSyncServiceImpl extends RemoteServiceServlet implem
|
||||||
ThSynchFolderConfiguration config = null;
|
ThSynchFolderConfiguration config = null;
|
||||||
if(clientConfig!=null) {
|
if(clientConfig!=null) {
|
||||||
targetScopeUserToken = PortalContext.getConfiguration().getCurrentUserToken(clientConfig.getSelectedScope().getScopeName(), user.getUsername());
|
targetScopeUserToken = PortalContext.getConfiguration().getCurrentUserToken(clientConfig.getSelectedScope().getScopeName(), user.getUsername());
|
||||||
config = BeanConverter.toThSynchFolderConfiguration(clientConfig, targetScopeUserToken);
|
config = BeanConverter.toThSynchFolderConfiguration(clientConfig, folderId, targetScopeUserToken);
|
||||||
logger.debug("Creating server config "+config);
|
logger.debug("Creating server config "+config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,8 @@ public class WsThreddsSynchFolderConfiguration implements Serializable{
|
||||||
|
|
||||||
private Status status; //just for serialization
|
private Status status; //just for serialization
|
||||||
|
|
||||||
|
private String rootFolderId;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Instantiates a new ws thredds synch folder configuration.
|
* Instantiates a new ws thredds synch folder configuration.
|
||||||
|
@ -50,14 +52,34 @@ public class WsThreddsSynchFolderConfiguration implements Serializable{
|
||||||
* @param filter the filter
|
* @param filter the filter
|
||||||
* @param catalogName the catalog name
|
* @param catalogName the catalog name
|
||||||
*/
|
*/
|
||||||
public WsThreddsSynchFolderConfiguration(String remotePath, GcubeScope theVRE, String filter, String catalogName) {
|
public WsThreddsSynchFolderConfiguration(String remotePath, GcubeScope theVRE, String filter, String catalogName, String rootFolderId) {
|
||||||
super();
|
super();
|
||||||
this.remotePath = remotePath;
|
this.remotePath = remotePath;
|
||||||
this.selectedScope = theVRE;
|
this.selectedScope = theVRE;
|
||||||
this.filter = filter;
|
this.filter = filter;
|
||||||
this.catalogName = catalogName;
|
this.catalogName = catalogName;
|
||||||
|
this.rootFolderId = rootFolderId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param rootFolderId the rootFolderId to set
|
||||||
|
*/
|
||||||
|
public void setRootFolderId(String rootFolderId) {
|
||||||
|
|
||||||
|
this.rootFolderId = rootFolderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the rootFolderId
|
||||||
|
*/
|
||||||
|
public String getRootFolderId() {
|
||||||
|
|
||||||
|
return rootFolderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the remote path.
|
* Gets the remote path.
|
||||||
*
|
*
|
||||||
|
@ -169,10 +191,11 @@ public class WsThreddsSynchFolderConfiguration implements Serializable{
|
||||||
builder.append(catalogName);
|
builder.append(catalogName);
|
||||||
builder.append(", status=");
|
builder.append(", status=");
|
||||||
builder.append(status);
|
builder.append(status);
|
||||||
|
builder.append(", rootFolderId=");
|
||||||
|
builder.append(rootFolderId);
|
||||||
builder.append("]");
|
builder.append("]");
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.gcube.portlets.widgets.wsthreddssync;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
import java.util.concurrent.Semaphore;
|
|
||||||
|
|
||||||
import org.gcube.common.homelibrary.home.HomeLibrary;
|
import org.gcube.common.homelibrary.home.HomeLibrary;
|
||||||
import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
|
import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
|
||||||
|
@ -70,7 +69,7 @@ public class TestWsThreddsEngine {
|
||||||
String remotePersistence = "";
|
String remotePersistence = "";
|
||||||
String remotePath = "";
|
String remotePath = "";
|
||||||
String targetToken = "";
|
String targetToken = "";
|
||||||
SynchFolderConfiguration config = new SynchFolderConfiguration(remotePath, filter, targetToken, remotePersistence);
|
SynchFolderConfiguration config = new SynchFolderConfiguration(remotePath, filter, targetToken, remotePersistence, folder.getId());
|
||||||
|
|
||||||
try {
|
try {
|
||||||
//try to clean it up, first..
|
//try to clean it up, first..
|
||||||
|
|
Loading…
Reference in New Issue