gCubeSystem
/
storagehub
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

some update

This commit is contained in:
lucio 2024-07-25 11:40:07 +02:00
parent cf78d06b64
commit 16f61a0a61
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -1,4 +1,3 @@
FROM d4science/smartgears-distribution:4.0.1-SNAPSHOT-java17-tomcat10.1.19 FROM d4science/smartgears-distribution:4.0.1-SNAPSHOT-java17-tomcat10.1.19
COPY ./target/storagehub.war /tomcat/webapps/ COPY ./target/storagehub.war /tomcat/webapps/
#COPY ./docker/jackrabbit/bootstrap.properties /app/jackrabbit/
COPY ./docker/storagehub.xml /tomcat/conf/Catalina/localhost/ COPY ./docker/storagehub.xml /tomcat/conf/Catalina/localhost/

1
src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java
View File

@ -277,7 +277,6 @@ public class ItemsManager extends Impersonable{
@GET @GET
@Path("{id}/children/count") @Path("{id}/children/count")
@Produces(MediaType.APPLICATION_JSON)
public Long countById(@QueryParam("showHidden") Boolean showHidden, @QueryParam("exclude") List<String> excludes, @QueryParam("onlyType") String nodeType){ public Long countById(@QueryParam("showHidden") Boolean showHidden, @QueryParam("exclude") List<String> excludes, @QueryParam("onlyType") String nodeType){
InnerMethodName.set("countById"); InnerMethodName.set("countById");
Session ses = null; Session ses = null;

2
src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java
View File

@ -470,7 +470,7 @@ public class WorkspaceManager extends Impersonable {
try { try {
ses = repository.getRepository().login(Constants.JCR_CREDENTIALS); ses = repository.getRepository().login(Constants.JCR_CREDENTIALS);
sharedPath = pathUtil.getSharedWithMePath(currentUser); sharedPath = pathUtil.getSharedWithMePath(currentUser);
log.info("vres folder path is {}", sharedPath.toPath()); log.info("shared With Me folder path is {}", sharedPath.toPath());
toReturn = Utils.getItemList(ses.getNode(sharedPath.toPath()), excludes, null, false, SharedFolder.class); toReturn = Utils.getItemList(ses.getNode(sharedPath.toPath()), excludes, null, false, SharedFolder.class);
} catch (RepositoryException re) { } catch (RepositoryException re) {

7
src/test/java/org/gcube/data/access/fs/external/CreateUsers.java vendored
View File

@ -112,6 +112,13 @@ public class CreateUsers {
createRandomFolderAndFileForCurrentUser(); createRandomFolderAndFileForCurrentUser();
} }
@Test
public void uploadFileUser2() throws Exception {
client.impersonate(user2);
String rootId = this.getUserRootId();
this.uploadFileWithRandomNameForCurrentUser(rootId);
}
@Test @Test
public void createFileAndFolderFarAllUsers() throws Exception { public void createFileAndFolderFarAllUsers() throws Exception {
client.impersonate(user2); client.impersonate(user2);