brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/3] incubator-brooklyn git commit: replaced jython imports with guava equivalents
Date Thu, 10 Dec 2015 17:20:28 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master dc17ddcae -> d58d5035f


replaced jython imports with guava equivalents


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/96f10e40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/96f10e40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/96f10e40

Branch: refs/heads/master
Commit: 96f10e40a3665cdeedd022bd5435dfc8ebf4e9b9
Parents: dc17ddc
Author: John McCabe <john@johnmccabe.net>
Authored: Thu Dec 10 12:38:33 2015 +0000
Committer: John McCabe <john@johnmccabe.net>
Committed: Thu Dec 10 12:38:33 2015 +0000

----------------------------------------------------------------------
 usage/camp/pom.xml                                                 | 1 -
 .../apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java   | 2 +-
 .../org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java  | 2 +-
 .../brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java | 2 +-
 .../org/apache/brooklyn/rest/resources/ApidocResourceTest.java     | 2 +-
 .../brooklyn/test/framework/TestFrameworkAssertionsTest.java       | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/96f10e40/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index d04eef6..af57227 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -196,7 +196,6 @@
                     <instructions>
                         <Export-Package>org.apache.brooklyn.*</Export-Package>
                         <Import-Package>
-                            !org.python.google.common.collect
                             *
                         </Import-Package>
                     </instructions>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/96f10e40/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
index 4c70332..602baa3 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.camp.brooklyn.spi.creation;
 
 import java.util.Set;
 
+import com.google.common.collect.Iterables;
 import org.apache.brooklyn.api.entity.Application;
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.entity.EntitySpec;
@@ -39,7 +40,6 @@ import org.apache.brooklyn.core.mgmt.EntityManagementUtils;
 import org.apache.brooklyn.core.typereg.RegisteredTypes;
 import org.apache.brooklyn.util.collections.MutableSet;
 import org.apache.brooklyn.util.text.Strings;
-import org.python.google.common.collect.Iterables;
 
 import com.google.common.collect.ImmutableSet;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/96f10e40/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java
b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java
index 2644303..e075080 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java
@@ -24,6 +24,7 @@ import static org.testng.Assert.fail;
 import java.io.StringReader;
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.mgmt.ManagementContext;
 import org.apache.brooklyn.config.ConfigKey;
@@ -37,7 +38,6 @@ import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
 import org.apache.brooklyn.core.test.entity.TestApplication;
 import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess;
 import org.apache.brooklyn.util.exceptions.Exceptions;
-import org.python.google.common.collect.Iterables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/96f10e40/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
index 068f428..bc3e627 100644
--- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
+++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.launcher.blueprints;
 
 import java.io.StringReader;
 
+import com.google.common.collect.Iterables;
 import org.apache.brooklyn.api.entity.Application;
 import org.apache.brooklyn.api.location.MachineProvisioningLocation;
 import org.apache.brooklyn.core.entity.Entities;
@@ -28,7 +29,6 @@ import org.apache.brooklyn.entity.software.base.test.location.WindowsTestFixture
 import org.apache.brooklyn.location.winrm.AdvertiseWinrmLoginPolicy;
 import org.apache.brooklyn.location.winrm.WinRmMachineLocation;
 import org.apache.brooklyn.util.text.Strings;
-import org.python.google.common.collect.Iterables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterMethod;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/96f10e40/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApidocResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApidocResourceTest.java
b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApidocResourceTest.java
index 9314288..739d63f 100644
--- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApidocResourceTest.java
+++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApidocResourceTest.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.rest.resources;
 
 
 import com.google.common.base.Function;
+import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
@@ -53,7 +54,6 @@ import org.apache.brooklyn.rest.api.EffectorApi;
 import org.apache.brooklyn.rest.api.EntityApi;
 import org.apache.brooklyn.rest.filter.SwaggerFilter;
 import org.apache.brooklyn.rest.util.ShutdownHandlerProvider;
-import org.python.google.common.base.Joiner;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/96f10e40/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java
----------------------------------------------------------------------
diff --git a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java
b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java
index 482cf5e..22197e5 100644
--- a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java
+++ b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java
@@ -19,10 +19,10 @@
 package org.apache.brooklyn.test.framework;
 
 import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableMap;
 import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.util.text.Identifiers;
 import org.apache.brooklyn.util.time.Duration;
-import org.python.google.common.collect.ImmutableMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeMethod;


Mime
View raw message