diff --git a/Dockerfile b/Dockerfile index 64f5879..7c7a863 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ FROM d4science/smartgears-distribution:4.0.1-SNAPSHOT-java17-tomcat10.1.19 COPY ./target/storagehub.war /tomcat/webapps/ - #COPY ./docker/jackrabbit/bootstrap.properties /app/jackrabbit/ COPY ./docker/storagehub.xml /tomcat/conf/Catalina/localhost/ diff --git a/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java b/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java index d989c38..713e493 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java @@ -277,7 +277,6 @@ public class ItemsManager extends Impersonable{ @GET @Path("{id}/children/count") - @Produces(MediaType.APPLICATION_JSON) public Long countById(@QueryParam("showHidden") Boolean showHidden, @QueryParam("exclude") List excludes, @QueryParam("onlyType") String nodeType){ InnerMethodName.set("countById"); Session ses = null; diff --git a/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java b/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java index da9c779..7e1b10c 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java @@ -470,7 +470,7 @@ public class WorkspaceManager extends Impersonable { try { ses = repository.getRepository().login(Constants.JCR_CREDENTIALS); 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); } catch (RepositoryException re) { diff --git a/src/test/java/org/gcube/data/access/fs/external/CreateUsers.java b/src/test/java/org/gcube/data/access/fs/external/CreateUsers.java index bd86cde..c1c30e7 100644 --- a/src/test/java/org/gcube/data/access/fs/external/CreateUsers.java +++ b/src/test/java/org/gcube/data/access/fs/external/CreateUsers.java @@ -112,6 +112,13 @@ public class CreateUsers { createRandomFolderAndFileForCurrentUser(); } + @Test + public void uploadFileUser2() throws Exception { + client.impersonate(user2); + String rootId = this.getUserRootId(); + this.uploadFileWithRandomNameForCurrentUser(rootId); + } + @Test public void createFileAndFolderFarAllUsers() throws Exception { client.impersonate(user2);