Rename utils-groovyâs package to o.a.b.util.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/3189559e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/3189559e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/3189559e Branch: refs/heads/0.8.0-incubating Commit: 3189559edacd1419c1c45c6f2336d1208778b513 Parents: d56557b Author: Aled Sage <[email protected]> Authored: Wed Aug 19 17:36:13 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 19 18:22:10 2015 +0100 ---------------------------------------------------------------------- .../nosql/infinispan/Infinispan5ServerIntegrationTest.groovy | 2 +- .../brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java | 2 +- .../apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy | 2 +- .../jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3189559e/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy index a69121c..b283f2f 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy @@ -35,7 +35,7 @@ import org.apache.brooklyn.api.entity.Application import org.apache.brooklyn.core.entity.Entities import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation import org.apache.brooklyn.core.test.entity.TestApplicationImpl -import org.apache.brooklyn.util.internal.TimeExtras +import org.apache.brooklyn.util.groovy.internal.TimeExtras import org.apache.brooklyn.util.net.Networking import org.apache.brooklyn.util.repeat.Repeater http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3189559e/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 f3f8281..a4382ce 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 @@ -18,7 +18,6 @@ */ package org.apache.brooklyn.entity.nosql.couchdb; -import org.apache.brooklyn.util.internal.TimeExtras; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -28,6 +27,7 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.util.groovy.internal.TimeExtras; /** * CouchDB test framework for integration and live tests. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3189559e/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 04540aa..6bb41cf 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 @@ -37,7 +37,7 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7ServerImpl import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer import org.apache.brooklyn.entity.webapp.tomcat.TomcatServerImpl import org.apache.brooklyn.test.TestUtils -import org.apache.brooklyn.util.internal.TimeExtras +import org.apache.brooklyn.util.groovy.internal.TimeExtras import org.slf4j.Logger import org.slf4j.LoggerFactory import org.testng.annotations.AfterMethod http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3189559e/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 d13f8ee..a4dec8c 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 @@ -41,7 +41,7 @@ import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.test.WebAppMonitor; import org.apache.brooklyn.test.support.TestResourceUnavailableException; -import org.apache.brooklyn.util.internal.TimeExtras; +import org.apache.brooklyn.util.groovy.internal.TimeExtras; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod;
