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 2016/02/01 18:47:26 UTC
[06/51] [abbrv] brooklyn-library git commit: BROOKLYN-162 - apply
org.apache package prefix to utils-groovy
BROOKLYN-162 - apply org.apache package prefix to utils-groovy
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/6c5fe7ce
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/6c5fe7ce
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/6c5fe7ce
Branch: refs/heads/0.8.0-incubating
Commit: 6c5fe7ce84ae7690ad23799c9580f696802cc054
Parents: 37fc5ed
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Aug 18 13:18:00 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Aug 18 14:51:57 2015 +0100
----------------------------------------------------------------------
.../brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java | 3 +--
.../brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy | 2 +-
.../ControlledDynamicWebAppClusterRebindIntegrationTest.java | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/6c5fe7ce/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java
index c5c732b..e967899 100644
--- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java
+++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java
@@ -19,6 +19,7 @@
package org.apache.brooklyn.entity.nosql.couchdb;
import org.apache.brooklyn.test.entity.TestApplication;
+import org.apache.brooklyn.util.internal.TimeExtras;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
@@ -30,8 +31,6 @@ import brooklyn.entity.basic.Entities;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation;
-import brooklyn.util.internal.TimeExtras;
-
/**
* CouchDB test framework for integration and live tests.
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/6c5fe7ce/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy
index 769e5a5..6e49882 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy
@@ -44,7 +44,7 @@ import org.apache.brooklyn.api.location.Location
import org.apache.brooklyn.location.basic.BasicLocationRegistry
import org.apache.brooklyn.test.TestUtils
import org.apache.brooklyn.test.entity.TestApplicationImpl
-import brooklyn.util.internal.TimeExtras
+import org.apache.brooklyn.util.internal.TimeExtras
/**
* This tests that we can run jboss entity on AWS.
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/6c5fe7ce/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java
index 588a890..4d47ee2 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java
@@ -37,6 +37,7 @@ import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster;
import org.apache.brooklyn.test.TestResourceUnavailableException;
import org.apache.brooklyn.test.WebAppMonitor;
import org.apache.brooklyn.test.entity.TestApplication;
+import org.apache.brooklyn.util.internal.TimeExtras;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
@@ -50,8 +51,6 @@ import brooklyn.entity.rebind.RebindTestUtils;
import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation;
-import brooklyn.util.internal.TimeExtras;
-
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;