You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/11/15 01:05:25 UTC
[16/21] incubator-brooklyn git commit: Fix generated zip entries -
use supported argument.
Fix generated zip entries - use supported argument.
Seem the ArchiveBuilder can't create archives without root-level folder, pass an actual folder name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1a4e8539
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1a4e8539
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1a4e8539
Branch: refs/heads/master
Commit: 1a4e8539dbc89e8d7f2e818c79611f72bc35c334
Parents: 24a3c34
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Nov 14 16:05:18 2014 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Nov 14 16:05:18 2014 +0200
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/resources/ServerResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1a4e8539/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
index b96c1b4..2a4a8c5 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
@@ -310,7 +310,7 @@ public class ServerResource extends AbstractBrooklynRestResource implements Serv
BrooklynPersistenceUtils.writeMemento(mgmt(), targetStore, preferredOrigin);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ArchiveBuilder.zip().addDirContentsAt( ((FileBasedObjectStore)targetStore).getBaseDir(), "/" ).stream(baos);
+ ArchiveBuilder.zip().addDirContentsAt( ((FileBasedObjectStore)targetStore).getBaseDir(), ((FileBasedObjectStore)targetStore).getBaseDir().getName() ).stream(baos);
String filename = "brooklyn-state-"+label+".zip";
return Response.ok(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM_TYPE)
.header("Content-Disposition","attachment; filename = "+filename)