[01/19] incubator-brooklyn git commit: [BROOKLYN-162] Rename ./api/basic; use the no split package convention

[hadrian]

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 4243d5311 -> a76dac4f0


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9bb882c5/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java
----------------------------------------------------------------------
diff --git 
a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java
 
b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java
index 697fcdd..a6a143c 100644
--- 
a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java
+++ 
b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java
@@ -21,6 +21,7 @@ package org.apache.brooklyn.rest.util.json;
 import java.io.IOException;
 import java.util.Map;
 
+import org.apache.brooklyn.api.basic.BrooklynObject;
 import org.apache.brooklyn.management.ManagementContext;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonGenerator;
@@ -32,7 +33,6 @@ import org.codehaus.jackson.map.JsonSerializer;
 import org.codehaus.jackson.map.SerializerProvider;
 import org.codehaus.jackson.map.module.SimpleModule;
 
-import brooklyn.basic.BrooklynObject;
 import brooklyn.entity.Entity;
 import brooklyn.location.Location;