You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/06/08 06:43:56 UTC
[1/2] git commit: JCLOUDS-546: Remove Javadoc @author annotations
Repository: jclouds-karaf
Updated Branches:
refs/heads/master 7fd759abf -> 20bb5f06d
JCLOUDS-546: Remove Javadoc @author annotations
Annotations removed with:
find -name \*.java | xargs sed -i /@author/d
Empty Javadoc removed with multiple iterations of:
find -name \*.java | xargs sed -i -z 's/ \*\n \*\// \*\//'
find -name \*.java | xargs sed -i -z 's/ \* \n \*\// \*\//'
find -name \*.java | xargs sed -i -z 's/\/\*\*\n \*\/\n//'
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/5b2387d4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/5b2387d4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/5b2387d4
Branch: refs/heads/master
Commit: 5b2387d4e7d4bdb2ef3a0733ba1ec95829e89372
Parents: 7fd759a
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat Jun 7 21:16:10 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Jun 7 21:17:58 2014 -0700
----------------------------------------------------------------------
.../org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java | 3 ---
.../org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java | 3 ---
.../org/jclouds/karaf/commands/blobstore/BlobListCommand.java | 2 --
.../org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java | 2 --
.../org/jclouds/karaf/commands/blobstore/BlobReadCommand.java | 3 ---
.../org/jclouds/karaf/commands/blobstore/BlobRemoveCommand.java | 2 --
.../jclouds/karaf/commands/blobstore/BlobStoreCommandBase.java | 3 ---
.../karaf/commands/blobstore/BlobStoreCommandWithOptions.java | 3 ---
.../org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java | 3 ---
.../jclouds/karaf/commands/blobstore/ContainerClearCommand.java | 2 --
.../jclouds/karaf/commands/blobstore/ContainerCreateCommand.java | 3 ---
.../jclouds/karaf/commands/blobstore/ContainerDeleteCommand.java | 3 ---
.../jclouds/karaf/commands/blobstore/ContainerExistsCommand.java | 2 --
.../jclouds/karaf/commands/blobstore/ContainerListCommand.java | 2 --
.../karaf/commands/blobstore/ContainerMetadataCommand.java | 2 --
.../org/jclouds/karaf/commands/blobstore/LocationListCommand.java | 2 --
.../org/jclouds/karaf/commands/compute/ComputeCommandBase.java | 3 ---
.../jclouds/karaf/commands/compute/ComputeCommandWithOptions.java | 3 ---
.../org/jclouds/karaf/commands/compute/GroupDestroyCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/GroupRunScriptCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/HardwareListCommand.java | 3 ---
.../java/org/jclouds/karaf/commands/compute/ImageListCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/LocationListCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/NodeCreateCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/NodeDestroyCommand.java | 3 ---
.../java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java | 3 ---
.../java/org/jclouds/karaf/commands/compute/NodeListCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/NodeResumeCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/NodeRunScriptCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/NodeSuspendCommand.java | 3 ---
.../org/jclouds/karaf/commands/compute/ProviderInfoCommand.java | 3 ---
.../java/org/jclouds/karaf/commands/compute/RunScriptBase.java | 3 ---
.../main/java/org/jclouds/karaf/services/internal/Activator.java | 3 ---
34 files changed, 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java
index 3ddaf8f..fd8234c 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java
@@ -26,9 +26,6 @@ import org.jclouds.karaf.chef.core.ChefHelper;
import java.util.Collections;
import java.util.List;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
public abstract class ChefCommandWithOptions extends ChefCommandBase {
@Option(name = "--name", description = "The service context name. Used to distinct between multiple service of the same provider/api. Only ")
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java
index b39b3f1..89f8f06 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobExistsCommand.java
@@ -35,9 +35,6 @@ import com.google.common.io.CharStreams;
import com.google.common.io.Files;
import com.google.common.io.InputSupplier;
-/**
- * @author: Andrew Gaul
- */
@Command(scope = "jclouds", name = "blobstore-blob-exists", description = "Checks existence of blob on the blobstore")
public class BlobExistsCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java
index 421dd56..4cb201d 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java
@@ -34,8 +34,6 @@ import org.jclouds.blobstore.options.ListContainerOptions;
/**
* List blobs in a container.
- *
- * @author: iocanel
*/
@Command(scope = "jclouds", name = "blobstore-list", description = "Lists blobs in a container")
public class BlobListCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java
index 0549e6b..a64f2e3 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java
@@ -33,8 +33,6 @@ import org.jclouds.io.ContentMetadata;
/**
* Print blob metadata.
- *
- * @author: Andrew Gaul
*/
@Command(scope = "jclouds", name = "blobstore-blob-metadata", description = "Print blob metadata")
public class BlobMetadataCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
index 2b3d705..99b37dc 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
@@ -34,9 +34,6 @@ import com.google.common.io.CharStreams;
import com.google.common.io.Files;
import com.google.common.io.InputSupplier;
-/**
- * @author: iocanel
- */
@Command(scope = "jclouds", name = "blobstore-read", description = "Reads data from the blobstore")
public class BlobReadCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobRemoveCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobRemoveCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobRemoveCommand.java
index b210c98..4b48f2b 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobRemoveCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobRemoveCommand.java
@@ -27,8 +27,6 @@ import org.jclouds.blobstore.BlobStore;
/**
* Remove blobs.
- *
- * @author Andrew Gaul
*/
@Command(scope = "jclouds", name = "blobstore-remove", description = "Removes blobs")
public class BlobRemoveCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandBase.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandBase.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandBase.java
index fd9d349..f659708 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandBase.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandBase.java
@@ -48,9 +48,6 @@ import java.util.ArrayList;
import java.util.Dictionary;
import java.util.List;
-/**
- * @author iocanel
- */
public abstract class BlobStoreCommandBase extends AbstractAction {
private static final Logger LOGGER = LoggerFactory.getLogger(BlobStoreCommandBase.class);
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java
index 28d104e..be01427 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java
@@ -35,9 +35,6 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
-/**
- * @author iocanel
- */
public abstract class BlobStoreCommandWithOptions extends BlobStoreCommandBase {
@Option(name = "--name", description = "The service context name. Used to distinct between multiple service of the same provider/api. Only usable in interactive mode.")
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java
index 490ea17..da14768 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java
@@ -31,9 +31,6 @@ import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.domain.BlobBuilder;
import org.jclouds.blobstore.options.PutOptions;
-/**
- * @author: iocanel
- */
@Command(scope = "jclouds", name = "blobstore-write", description = "Writes data to the blobstore")
public class BlobWriteCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerClearCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerClearCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerClearCommand.java
index eb3130a..f490f05 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerClearCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerClearCommand.java
@@ -28,8 +28,6 @@ import org.jclouds.blobstore.BlobStore;
/**
* Clear a container.
- *
- * @author: Andrew Gaul
*/
@Command(scope = "jclouds", name = "blobstore-container-clear", description = "Clears a container")
public class ContainerClearCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerCreateCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerCreateCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerCreateCommand.java
index 1424e51..f874479 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerCreateCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerCreateCommand.java
@@ -25,9 +25,6 @@ import org.apache.felix.gogo.commands.Option;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.domain.Location;
-/**
- * @author: iocanel
- */
@Command(scope = "jclouds", name = "blobstore-container-create", description = "Creates a container")
public class ContainerCreateCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerDeleteCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerDeleteCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerDeleteCommand.java
index a508804..371989c 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerDeleteCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerDeleteCommand.java
@@ -25,9 +25,6 @@ import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
import org.jclouds.blobstore.BlobStore;
-/**
- * @author: iocanel
- */
@Command(scope = "jclouds", name = "blobstore-container-delete", description = "Deletes a container")
public class ContainerDeleteCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerExistsCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerExistsCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerExistsCommand.java
index e5ecc42..9d8d882 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerExistsCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerExistsCommand.java
@@ -28,8 +28,6 @@ import org.jclouds.blobstore.ContainerNotFoundException;
/**
* Test whether a container exists.
- *
- * @author: Andrew Gaul
*/
@Command(scope = "jclouds", name = "blobstore-container-exists", description = "Test whether a container exists")
public class ContainerExistsCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerListCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerListCommand.java
index 5c05216..c74d7fe 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerListCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerListCommand.java
@@ -28,8 +28,6 @@ import org.jclouds.blobstore.domain.StorageMetadata;
/**
* List all container names.
- *
- * @author: Andrew Gaul
*/
@Command(scope = "jclouds", name = "blobstore-container-list", description = "Lists all container names")
public class ContainerListCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerMetadataCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerMetadataCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerMetadataCommand.java
index 3a991a7..229711a 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerMetadataCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/ContainerMetadataCommand.java
@@ -34,8 +34,6 @@ import org.jclouds.domain.Location;
/**
* Output container metadata.
- *
- * @author: Andrew Gaul
*/
@Command(scope = "jclouds", name = "blobstore-container-metadata", description = "Output container metadata")
public class ContainerMetadataCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/blobstore/LocationListCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/LocationListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/LocationListCommand.java
index 4154c92..33e2e81 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/LocationListCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/LocationListCommand.java
@@ -28,8 +28,6 @@ import org.jclouds.domain.Location;
/**
* List all location names.
- *
- * @author: Andrew Gaul
*/
@Command(scope = "jclouds", name = "blobstore-location-list", description = "List all location names")
public class LocationListCommand extends BlobStoreCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandBase.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandBase.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandBase.java
index 96b645c..8223f16 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandBase.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandBase.java
@@ -51,9 +51,6 @@ import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
public abstract class ComputeCommandBase extends AbstractAction {
public static final String NODE_DETAILS_FORMAT = "%20s %-60s";
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
index 294befc..3ab31e1 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
@@ -36,9 +36,6 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
public abstract class ComputeCommandWithOptions extends ComputeCommandBase {
@Option(name = "--name", description = "The service context name. Used to distinct between multiple service of the same provider/api. Only ")
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupDestroyCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupDestroyCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupDestroyCommand.java
index b3d3cd3..410d216 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupDestroyCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupDestroyCommand.java
@@ -30,9 +30,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "group-destroy", description = "Destroys a group of nodes.")
public class GroupDestroyCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupRunScriptCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupRunScriptCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupRunScriptCommand.java
index 71b11c1..cc5efea 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupRunScriptCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/GroupRunScriptCommand.java
@@ -20,9 +20,6 @@ package org.jclouds.karaf.commands.compute;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "group-runscript", description = "Executes a command or script to a group of nodes.")
public class GroupRunScriptCommand extends ComputeRunscriptBase {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java
index ab50dd0..ae91c0b 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java
@@ -20,9 +20,6 @@ package org.jclouds.karaf.commands.compute;
import org.apache.felix.gogo.commands.Command;
import org.jclouds.compute.ComputeService;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "hardware-list", description = "Lists the available hardware for the provider.")
public class HardwareListCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java
index 155bd2b..d9a003e 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java
@@ -25,9 +25,6 @@ import org.jclouds.karaf.commands.table.ShellTable;
import java.util.ArrayList;
import java.util.Arrays;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "image-list", description = "Lists the available images.")
public class ImageListCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java
index bfbc0b6..fac41ec 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java
@@ -20,9 +20,6 @@ package org.jclouds.karaf.commands.compute;
import org.apache.felix.gogo.commands.Command;
import org.jclouds.compute.ComputeService;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "location-list", description = "Lists the available locations.")
public class LocationListCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java
index f270bef..511f481 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java
@@ -39,9 +39,6 @@ import org.jclouds.scriptbuilder.statements.login.AdminAccess;
import java.util.List;
import java.util.Set;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "node-create", description = "Creates a node.", detailedDescription = "classpath:node-create.txt")
public class NodeCreateCommand extends ComputeCommandWithOptions {
@Option(name = "--adminAccess", description = "Sets up a user account with passwordless sudo access and copies ssh keys.")
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java
index 30859d4..994c5ce 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java
@@ -27,9 +27,6 @@ import org.jclouds.karaf.utils.ServiceHelper;
import java.util.Set;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "node-destroy-all", description = "Destroys all nodes.")
public class NodeDestroyAllCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java
index 3989260..93a1bb6 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java
@@ -24,9 +24,6 @@ import org.apache.felix.gogo.commands.Command;
import org.jclouds.compute.ComputeService;
import org.jclouds.karaf.core.Constants;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "node-destroy", description = "Destroys the specified nodes.")
public class NodeDestroyCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java
index 93e1a79..6fe361f 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java
@@ -24,9 +24,6 @@ import org.jclouds.compute.domain.NodeMetadata;
import com.google.common.collect.Sets;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "node-info", description = "Displays detailed information about a node.")
public class NodeInfoCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java
index c012ed5..f7ef3dd 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java
@@ -30,9 +30,6 @@ import org.jclouds.karaf.utils.ServiceHelper;
import java.util.Set;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "node-list", description = "Displays the list of nodes.")
public class NodeListCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java
index 3edfdee..04e3664 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java
@@ -21,9 +21,6 @@ import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.jclouds.compute.ComputeService;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "node-resume", description = "Resumes a node.")
public class NodeResumeCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeRunScriptCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeRunScriptCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeRunScriptCommand.java
index 3fe011e..434b6ff 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeRunScriptCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeRunScriptCommand.java
@@ -20,9 +20,6 @@ package org.jclouds.karaf.commands.compute;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "node-runscript", description = "Executes a command or a script to a node.")
public class NodeRunScriptCommand extends ComputeRunscriptBase {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java
index e0dc30a..47187bf 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java
@@ -21,9 +21,6 @@ import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.jclouds.compute.ComputeService;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "node-suspend", description = "Suspends a node.")
public class NodeSuspendCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/ProviderInfoCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ProviderInfoCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ProviderInfoCommand.java
index f17352d..d917e0a 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ProviderInfoCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ProviderInfoCommand.java
@@ -20,9 +20,6 @@ package org.jclouds.karaf.commands.compute;
import org.apache.felix.gogo.commands.Command;
import org.jclouds.compute.ComputeService;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
@Command(scope = "jclouds", name = "provider-info")
public class ProviderInfoCommand extends ComputeCommandWithOptions {
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java
index 63588fb..1f0811d 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java
@@ -41,9 +41,6 @@ import org.jclouds.karaf.utils.EnvHelper;
import com.google.common.base.Predicate;
import org.jclouds.scriptbuilder.domain.Statement;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
public abstract class RunScriptBase extends ComputeCommandWithOptions {
@Option(name = "-u", aliases = "--user", description = "The user that will run the script.", required = false, multiValued = false)
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/5b2387d4/services/src/main/java/org/jclouds/karaf/services/internal/Activator.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/jclouds/karaf/services/internal/Activator.java b/services/src/main/java/org/jclouds/karaf/services/internal/Activator.java
index 7d59174..4c537f4 100644
--- a/services/src/main/java/org/jclouds/karaf/services/internal/Activator.java
+++ b/services/src/main/java/org/jclouds/karaf/services/internal/Activator.java
@@ -26,9 +26,6 @@ import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ManagedServiceFactory;
-/**
- * @author <a href="mailto:gnodet[at]gmail.com">Guillaume Nodet (gnodet)</a>
- */
public class Activator implements BundleActivator {
ServiceRegistration computeFactoryRegistration;
[2/2] git commit: Address removal of calculateMD5
Posted by ga...@apache.org.
Address removal of calculateMD5
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/20bb5f06
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/20bb5f06
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/20bb5f06
Branch: refs/heads/master
Commit: 20bb5f06d5671f06a31ca3c5d135ace52267c5f3
Parents: 5b2387d
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat Jun 7 21:41:05 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Jun 7 21:41:05 2014 -0700
----------------------------------------------------------------------
.../karaf/commands/blobstore/BlobWriteCommand.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/20bb5f06/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java
index da14768..d5b42f9 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobWriteCommand.java
@@ -21,8 +21,11 @@ import java.io.InputStream;
import java.io.File;
import java.net.URL;
+import com.google.common.hash.Hashing;
+import com.google.common.io.ByteSource;
import com.google.common.io.ByteStreams;
import com.google.common.io.Closeables;
+import com.google.common.io.Files;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
@@ -70,9 +73,12 @@ public class BlobWriteCommand extends BlobStoreCommandWithOptions {
input.close();
}
} else {
- BlobBuilder.PayloadBlobBuilder payloadBuilder = builder.payload(new File(payload));
+ ByteSource byteSource = Files.asByteSource(new File(payload));
+ BlobBuilder.PayloadBlobBuilder payloadBuilder = builder
+ .payload(byteSource)
+ .contentLength(byteSource.size());
if (!multipartUpload) {
- payloadBuilder = payloadBuilder.calculateMD5();
+ payloadBuilder = payloadBuilder.contentMD5(byteSource.hash(Hashing.md5()).asBytes());
}
builder = payloadBuilder;
}