Fix conflicts after merging #797
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/34095203 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/34095203 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/34095203 Branch: refs/heads/master Commit: 3409520344503a14b988b8e9bfd7e43134f8d047 Parents: 7bc08a0 db9cb56 Author: Hadrian Zbarcea <[email protected]> Authored: Wed Aug 5 22:30:41 2015 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Wed Aug 5 22:30:41 2015 -0400 ---------------------------------------------------------------------- .../src/main/assembly/scripts/start.sh | 2 +- usage/cli/pom.xml | 6 +- .../org/apache/brooklyn/cli/AbstractMain.java | 1 - .../org/apache/brooklyn/cli/ItemLister.java | 1 - .../main/java/org/apache/brooklyn/cli/Main.java | 10 + .../java/org/apache/brooklyn/cli/CliTest.java | 6 + .../brooklyn/cli/CloudExplorerLiveTest.java | 1 + usage/dist/src/main/dist/bin/brooklyn | 2 +- usage/dist/src/main/dist/bin/brooklyn.bat | 2 +- usage/dist/src/main/dist/bin/brooklyn.ps1 | 2 +- .../apache/brooklyn/cli/CliIntegrationTest.java | 2 +- .../SoftlayerObtainPrivateLiveTest.java | 225 ------------------- .../SoftlayerObtainPrivateLiveTest.java | 225 +++++++++++++++++++ 13 files changed, 250 insertions(+), 235 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/34095203/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java ---------------------------------------------------------------------- diff --cc usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java index cd827e0,b8ced77..1c60fe7 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java @@@ -49,18 -49,17 +49,28 @@@ import brooklyn.basic.BrooklynTypes import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogItemType; +import org.apache.brooklyn.cli.CloudExplorer.BlobstoreGetBlobCommand; +import org.apache.brooklyn.cli.CloudExplorer.BlobstoreListContainerCommand; +import org.apache.brooklyn.cli.CloudExplorer.BlobstoreListContainersCommand; +import org.apache.brooklyn.cli.CloudExplorer.ComputeDefaultTemplateCommand; +import org.apache.brooklyn.cli.CloudExplorer.ComputeGetImageCommand; +import org.apache.brooklyn.cli.CloudExplorer.ComputeListHardwareProfilesCommand; +import org.apache.brooklyn.cli.CloudExplorer.ComputeListImagesCommand; +import org.apache.brooklyn.cli.CloudExplorer.ComputeListInstancesCommand; +import org.apache.brooklyn.cli.CloudExplorer.ComputeTerminateInstancesCommand; +import org.apache.brooklyn.cli.ItemLister.ListAllCommand; + import brooklyn.catalog.internal.CatalogInitialization; + import org.apache.brooklyn.cli.CloudExplorer.BlobstoreGetBlobCommand; + import org.apache.brooklyn.cli.CloudExplorer.BlobstoreListContainerCommand; + import org.apache.brooklyn.cli.CloudExplorer.BlobstoreListContainersCommand; + import org.apache.brooklyn.cli.CloudExplorer.ComputeDefaultTemplateCommand; + import org.apache.brooklyn.cli.CloudExplorer.ComputeGetImageCommand; + import org.apache.brooklyn.cli.CloudExplorer.ComputeListHardwareProfilesCommand; + import org.apache.brooklyn.cli.CloudExplorer.ComputeListImagesCommand; + import org.apache.brooklyn.cli.CloudExplorer.ComputeListInstancesCommand; + import org.apache.brooklyn.cli.CloudExplorer.ComputeTerminateInstancesCommand; + import org.apache.brooklyn.cli.ItemLister.ListAllCommand; import brooklyn.entity.Application; import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/34095203/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/34095203/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java ---------------------------------------------------------------------- diff --cc usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java index 8abe1c0,2df725e..c027c83 --- a/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java +++ b/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java @@@ -35,6 -33,8 +35,7 @@@ import org.testng.Assert import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; + import org.apache.brooklyn.cli.AbstractMain.BrooklynCommand; - import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists;
