gCubeSystem
/
workspace
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

settinng synched with thredds into parent folder

This commit is contained in:
Francesco Mangiacrapa 2021-05-18 11:05:56 +02:00
parent e7cc55efe3
commit d32869c6d0
5 changed files with 87 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.settings/com.gwtplugins.gdt.eclipse.core.prefs
View File

@ -1,4 +1,4 @@
eclipse.preferences.version=1
lastWarOutDir=/home/francesco-mangiacrapa/git/workspace/target/workspace-6.27.0-SNAPSHOT
lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.27.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false

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

@ -1,19 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="workspace-6.27.0-SNAPSHOT">
<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="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="workspace"/>
</wb-module>
<wb-module deploy-name="workspace-6.27.0-SNAPSHOT">
<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="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<dependent-module archiveName="workspace-tree-widget-6.33.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="ws-thredds-sync-widget-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ws-thredds-sync-widget/ws-thredds-sync-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="workspace"/>
</wb-module>
</project-modules>

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v6.27.0-SNAPSHOT] - 2021-05-10
[#21387] Harmonized version of jackson libs to 2.8.11 to resolve conflict
[#21346] Applying new workflow to manage the "Sync with Tredds" facility
## [v6.26.0] - 2021-04-12

3
src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
View File

@ -1415,6 +1415,7 @@ public class AppController implements SubscriberInterface {
//CREATING FOLDER PARENT FOR RPC
final FileModel parent = new FolderModel(folder.getIdentifier(), folder.getName(), folder.getParentFileModel(), true, folder.isShared(), folder.isVreFolder(), folder.isPublic());
parent.setSynchedWithWsThredds(folder.getSynchedWithWsThredds());
wsPortlet.getGridGroupContainer().mask(ConstantsExplorer.LOADING,ConstantsExplorer.LOADINGSTYLE);
appContrExplorer.getRpcWorkspaceService().getFolderChildrenForFileGrid(parent, new AsyncCallback<List<FileGridModel>>() {
@ -1440,7 +1441,7 @@ public class AppController implements SubscriberInterface {
wsPortlet.getGridGroupContainer().unmask();
wsPortlet.getGridGroupContainer().updateStore(result);
AppControllerExplorer.getEventBus().fireEvent(new CheckItemLockedBySyncEvent(folder));
//AppControllerExplorer.getEventBus().fireEvent(new CheckItemLockedBySyncEvent(folder));
}
});
}

1
src/test/resources/.gitignore vendored
View File

@ -4,3 +4,4 @@
/log4j.properties
/pred4s.gcubekey
/preprod.gcubekey
/devVRE.gcubekey