AMBARI-832. Merge ambari-api with ambari-server (mahadev)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1396109 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -12,6 +12,8 @@ AMBARI-666 branch (unreleased changes)
 
   NEW FEATURES
 
+  AMBARI-832. Merge ambari-api with ambari-server (mahadev)
+
   AMBARI-822. Implement an agent simulator for unit testing. (jitendra)
   
   AMBARI-829. Add unit tests for ResourceProviderImpl. (Tom Beerbower via

ambari-api/pom.xml

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License. See accompanying LICENSE file.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.ambari</groupId>
-    <artifactId>ambari-project</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
-    <relativePath>../ambari-project</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.ambari</groupId>
-  <artifactId>ambari-api</artifactId>
-  <packaging>jar</packaging>
-  <name>Ambari API</name>
-  <version>1.0.3-SNAPSHOT</version>
-  <description>Ambari API</description>
-  <profiles>
-    </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-server</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.2</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.xerial</groupId>
-      <artifactId>sqlite-jdbc</artifactId>
-      <version>3.7.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.objenesis</groupId>
-      <artifactId>objenesis-tck</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
-      <version>2.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-jaxrs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>3.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-bundle</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-grizzly</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey.contribs</groupId>
-      <artifactId>jersey-multipart</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.grizzly</groupId>
-      <artifactId>grizzly-comet-webserver</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>3.0</version>
-    </dependency>
-  </dependencies>
-</project>

ambari-project/pom.xml

@@ -241,7 +241,7 @@
       </dependency>
       <dependency>
         <groupId>com.sun.grizzly</groupId>
-        <artifactId>grizzly-comet-webserver</artifactId>
+        <artifactId>grizzly-comet-org.apache.ambari.server.controller.utilities.webserver</artifactId>
         <version>1.9.36</version>
       </dependency>
       <dependency>

ambari-server/pom.xml

@@ -188,6 +188,11 @@
       <groupId>com.sun.jersey.contribs</groupId>
       <artifactId>jersey-guice</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.9.2</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
@@ -220,5 +225,36 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.objenesis</groupId>
+      <artifactId>objenesis-tck</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>2.2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>3.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial</groupId>
+      <artifactId>sqlite-jdbc</artifactId>
+      <version>3.7.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>3.0</version>
+    </dependency>
   </dependencies>
 </project>

ambari-api/src/main/java/org/apache/ambari/api/handlers/BaseManagementHandler.java → ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.Request;
-import org.apache.ambari.api.services.Result;
-import org.apache.ambari.api.services.ResultImpl;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.api.services.Result;
+import org.apache.ambari.server.api.services.ResultImpl;
 
 /**
  * Base handler for operations that persist state to the back-end.

ambari-api/src/main/java/org/apache/ambari/api/handlers/CreateHandler.java → ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.services.*;
+import org.apache.ambari.server.api.services.*;
 
 
 /**

ambari-api/src/main/java/org/apache/ambari/api/handlers/DelegatingRequestHandler.java → ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DelegatingRequestHandler.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.services.Request;
-import org.apache.ambari.api.services.Result;
+import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.api.services.Result;
 
 /**
  * Request handler implementation that all requests are funneled through.

ambari-api/src/main/java/org/apache/ambari/api/handlers/DeleteHandler.java → ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.services.Request;
-import org.apache.ambari.api.services.Result;
+import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.api.services.Result;
 
 /**
  * Responsible for delete requests.

ambari-api/src/main/java/org/apache/ambari/api/handlers/ReadHandler.java → ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.services.Request;
-import org.apache.ambari.api.services.Result;
-import org.apache.ambari.api.query.Query;
+import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.api.services.Result;
+import org.apache.ambari.server.api.query.Query;
 import org.apache.ambari.server.AmbariException;
 
 /**

ambari-api/src/main/java/org/apache/ambari/api/handlers/RequestHandler.java → ambari-server/src/main/java/org/apache/ambari/server/api/handlers/RequestHandler.java

@@ -16,11 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.services.Request;
-import org.apache.ambari.api.services.Result;
-import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.api.services.Result;
 
 /**
  * Responsible for handling of requests and returning a result.

ambari-api/src/main/java/org/apache/ambari/api/handlers/RequestHandlerFactory.java → ambari-server/src/main/java/org/apache/ambari/server/api/handlers/RequestHandlerFactory.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.services.Request;
+import org.apache.ambari.server.api.services.Request;
 
 /**
  * Factory for {@link RequestHandler}

ambari-api/src/main/java/org/apache/ambari/api/handlers/UpdateHandler.java → ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.services.*;
+import org.apache.ambari.server.api.services.*;
 
 
 /**

ambari-api/src/main/java/org/apache/ambari/api/query/Query.java → ambari-server/src/main/java/org/apache/ambari/server/api/query/Query.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.query;
+package org.apache.ambari.server.api.query;
 
-import org.apache.ambari.api.services.Result;
+import org.apache.ambari.server.api.services.Result;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.PropertyId;

ambari-api/src/main/java/org/apache/ambari/api/query/QueryImpl.java → ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java

@@ -16,21 +16,20 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.query;
+package org.apache.ambari.server.api.query;
 
-import org.apache.ambari.api.controller.internal.PropertyIdImpl;
-import org.apache.ambari.api.controller.internal.RequestImpl;
-import org.apache.ambari.api.controller.utilities.ClusterControllerHelper;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.ResultImpl;
+import org.apache.ambari.server.controller.internal.PropertyIdImpl;
+import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.predicate.AndPredicate;
 import org.apache.ambari.server.controller.predicate.BasePredicate;
 import org.apache.ambari.server.controller.predicate.EqualsPredicate;
-import org.apache.ambari.api.services.Result;
-import org.apache.ambari.api.services.ResultImpl;
+import org.apache.ambari.server.api.services.Result;
 import org.apache.ambari.server.controller.spi.*;
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.util.TreeNode;
+import org.apache.ambari.server.api.util.TreeNode;
 
 import java.util.*;
 

ambari-api/src/main/java/org/apache/ambari/api/resources/BaseResourceDefinition.java → ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java

@@ -16,18 +16,18 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.resources;
+package org.apache.ambari.server.api.resources;
 
 
-import org.apache.ambari.api.controller.utilities.ClusterControllerHelper;
-import org.apache.ambari.api.query.Query;
-import org.apache.ambari.api.query.QueryImpl;
-import org.apache.ambari.api.services.Request;
+import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
+import org.apache.ambari.server.api.query.Query;
+import org.apache.ambari.server.api.query.QueryImpl;
+import org.apache.ambari.server.api.services.Request;
 import org.apache.ambari.server.controller.spi.ClusterController;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.Schema;
-import org.apache.ambari.api.util.TreeNode;
+import org.apache.ambari.server.api.util.TreeNode;
 
 import java.util.*;
 

ambari-api/src/main/java/org/apache/ambari/api/resources/ClusterResourceDefinition.java → ambari-server/src/main/java/org/apache/ambari/server/api/resources/ClusterResourceDefinition.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.resources;
+package org.apache.ambari.server.api.resources;
 
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;

ambari-api/src/main/java/org/apache/ambari/api/resources/ComponentResourceDefinition.java → ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentResourceDefinition.java

@@ -17,16 +17,14 @@
  */
 
 
-package org.apache.ambari.api.resources;
+package org.apache.ambari.server.api.resources;
 
-import org.apache.ambari.api.controller.utilities.ClusterControllerHelper;
-import org.apache.ambari.api.services.Request;
+import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
+import org.apache.ambari.server.api.services.Request;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.Schema;
-import org.apache.ambari.api.util.TreeNode;
-
-import org.apache.ambari.api.services.ResultPostProcessor;
+import org.apache.ambari.server.api.util.TreeNode;
 
 import java.util.*;
 
@@ -105,7 +103,7 @@ public class ComponentResourceDefinition extends BaseResourceDefinition {
   }
 
   /**
-   * Base resource processor which generates href's.  This is called by the {@link ResultPostProcessor} during post
+   * Base resource processor which generates href's.  This is called by the {@link org.apache.ambari.server.api.services.ResultPostProcessor} during post
    * processing of a result.
    */
   private class ComponentHrefProcessor extends BaseHrefPostProcessor {

ambari-api/src/main/java/org/apache/ambari/api/resources/HostComponentResourceDefinition.java → ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java

@@ -16,17 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.resources;
+package org.apache.ambari.server.api.resources;
 
-import org.apache.ambari.api.controller.internal.PropertyIdImpl;
-import org.apache.ambari.api.controller.utilities.ClusterControllerHelper;
-import org.apache.ambari.api.services.Request;
+import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.controller.internal.PropertyIdImpl;
+import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.Schema;
-import org.apache.ambari.api.util.TreeNode;
-
-import org.apache.ambari.api.services.ResultPostProcessor;
+import org.apache.ambari.server.api.util.TreeNode;
 
 import java.util.*;
 
@@ -107,7 +105,7 @@ public class HostComponentResourceDefinition extends BaseResourceDefinition {
 
   /**
    * Host_Component resource processor which is responsible for generating href's for host components.
-   * This is called by the {@link ResultPostProcessor} during post processing of a result.
+   * This is called by the {@link org.apache.ambari.server.api.services.ResultPostProcessor} during post processing of a result.
    */
   private class HostComponentHrefProcessor extends BaseHrefPostProcessor {
     @Override
@@ -134,7 +132,7 @@ public class HostComponentResourceDefinition extends BaseResourceDefinition {
 
   /**
    * Host_Component resource processor which is responsible for generating a host section for host components.
-   * This is called by the {@link ResultPostProcessor} during post processing of a result.
+   * This is called by the {@link org.apache.ambari.server.api.services.ResultPostProcessor} during post processing of a result.
    */
   private class HostComponentHostProcessor implements PostProcessor {
     @Override

ambari-api/src/main/java/org/apache/ambari/api/resources/HostResourceDefinition.java → ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostResourceDefinition.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.resources;
+package org.apache.ambari.server.api.resources;
 
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;

ambari-api/src/main/java/org/apache/ambari/api/resources/ResourceDefinition.java → ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceDefinition.java

@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.resources;
+package org.apache.ambari.server.api.resources;
 
-import org.apache.ambari.api.query.Query;
-import org.apache.ambari.api.services.Request;
+import org.apache.ambari.server.api.query.Query;
+import org.apache.ambari.server.api.services.Request;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.api.util.TreeNode;
+import org.apache.ambari.server.api.util.TreeNode;
 
-import org.apache.ambari.api.services.ResultPostProcessor;
+import org.apache.ambari.server.api.services.ResultPostProcessor;
 
 import java.util.List;
 import java.util.Map;

ambari-api/src/main/java/org/apache/ambari/api/resources/ServiceResourceDefinition.java → ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.resources;
+package org.apache.ambari.server.api.resources;
 
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;

ambari-api/src/main/java/org/apache/ambari/api/services/BasePersistenceManager.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/BasePersistenceManager.java

@@ -16,11 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.controller.internal.RequestImpl;
-import org.apache.ambari.api.controller.utilities.ClusterControllerHelper;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.ClusterController;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Request;

ambari-api/src/main/java/org/apache/ambari/api/services/BaseService.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.handlers.DelegatingRequestHandler;
-import org.apache.ambari.api.handlers.RequestHandler;
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.handlers.DelegatingRequestHandler;
+import org.apache.ambari.server.api.handlers.RequestHandler;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.serializers.ResultSerializer;
 
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;

ambari-api/src/main/java/org/apache/ambari/api/services/ClusterService.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ClusterResourceDefinition;
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ClusterResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.*;

ambari-api/src/main/java/org/apache/ambari/api/services/ComponentService.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ComponentResourceDefinition;
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ComponentResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.*;

ambari-api/src/main/java/org/apache/ambari/api/services/CreatePersistenceManager.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/CreatePersistenceManager.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.spi.ClusterController;
 import org.apache.ambari.server.controller.spi.Resource;

ambari-api/src/main/java/org/apache/ambari/api/services/DeletePersistenceManager.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/DeletePersistenceManager.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 import org.apache.ambari.server.AmbariException;
 
 /**

ambari-api/src/main/java/org/apache/ambari/api/services/HostComponentService.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.HostComponentResourceDefinition;
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.HostComponentResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.*;

ambari-api/src/main/java/org/apache/ambari/api/services/HostService.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.HostResourceDefinition;
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.HostResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.*;

ambari-api/src/main/java/org/apache/ambari/api/services/PersistenceManager.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistenceManager.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 
 /**
  * Persistence manager which is responsible for persisting a resource state to the back end.

ambari-api/src/main/java/org/apache/ambari/api/services/Request.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/Request.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.serializers.ResultSerializer;
 import org.apache.ambari.server.controller.spi.PropertyId;
 
 import java.net.URI;

ambari-api/src/main/java/org/apache/ambari/api/services/RequestFactory.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.UriInfo;

ambari-api/src/main/java/org/apache/ambari/api/services/RequestImpl.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestImpl.java

@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.*;
-import org.apache.ambari.api.services.parsers.JsonPropertyParser;
-import org.apache.ambari.api.services.parsers.RequestBodyParser;
-import org.apache.ambari.api.services.serializers.JsonSerializer;
-import org.apache.ambari.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.resources.*;
+import org.apache.ambari.server.api.services.parsers.JsonPropertyParser;
+import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
+import org.apache.ambari.server.api.services.serializers.JsonSerializer;
+import org.apache.ambari.server.api.services.serializers.ResultSerializer;
 import org.apache.ambari.server.controller.spi.PropertyId;
 
 import javax.ws.rs.core.HttpHeaders;

ambari-api/src/main/java/org/apache/ambari/api/services/ResponseFactory.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/ResponseFactory.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 import javax.ws.rs.core.Response;
 

ambari-api/src/main/java/org/apache/ambari/api/services/Result.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.api.util.TreeNode;
+import org.apache.ambari.server.api.util.TreeNode;
 
 /**
  * Represents a result from a request handler invocation.

ambari-api/src/main/java/org/apache/ambari/api/services/ResultImpl.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.api.util.TreeNode;
-import org.apache.ambari.api.util.TreeNodeImpl;
+import org.apache.ambari.server.api.util.TreeNode;
+import org.apache.ambari.server.api.util.TreeNodeImpl;
 
 
 /**

ambari-api/src/main/java/org/apache/ambari/api/services/ResultPostProcessor.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessor.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 /**
  * Processor which processes result objects prior to them being returned to the service.

ambari-api/src/main/java/org/apache/ambari/api/services/ResultPostProcessorImpl.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.api.util.TreeNode;
+import org.apache.ambari.server.api.util.TreeNode;
 
 import java.util.ArrayList;
 import java.util.HashMap;

ambari-api/src/main/java/org/apache/ambari/api/services/ServiceService.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.resources.ServiceResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ServiceResourceDefinition;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.*;
@@ -57,7 +57,7 @@ public class ServiceService extends BaseService {
   public Response getService(@Context HttpHeaders headers, @Context UriInfo ui,
                              @PathParam("serviceName") String serviceName) {
 
-    return handleRequest(headers, null, ui, Request.Type.GET,
+    return handleRequest(headers, null, ui, org.apache.ambari.server.api.services.Request.Type.GET,
         createResourceDefinition(serviceName, m_clusterName));
   }
 
@@ -72,7 +72,7 @@ public class ServiceService extends BaseService {
   @GET
   @Produces("text/plain")
   public Response getServices(@Context HttpHeaders headers, @Context UriInfo ui) {
-    return handleRequest(headers, null, ui, Request.Type.GET,
+    return handleRequest(headers, null, ui, org.apache.ambari.server.api.services.Request.Type.GET,
         createResourceDefinition(null, m_clusterName));
   }
 
@@ -91,7 +91,7 @@ public class ServiceService extends BaseService {
   public Response createService(String body, @Context HttpHeaders headers, @Context UriInfo ui,
                                 @PathParam("serviceName") String serviceName) {
 
-    return handleRequest(headers, body, ui, Request.Type.PUT, createResourceDefinition(serviceName, m_clusterName));
+    return handleRequest(headers, body, ui, org.apache.ambari.server.api.services.Request.Type.PUT, createResourceDefinition(serviceName, m_clusterName));
   }
 
   /**
@@ -109,7 +109,7 @@ public class ServiceService extends BaseService {
   public Response updateService(String body, @Context HttpHeaders headers, @Context UriInfo ui,
                                 @PathParam("serviceName") String serviceName) {
 
-    return handleRequest(headers, body, ui, Request.Type.POST, createResourceDefinition(serviceName, m_clusterName));
+    return handleRequest(headers, body, ui, org.apache.ambari.server.api.services.Request.Type.POST, createResourceDefinition(serviceName, m_clusterName));
   }
 
   /**
@@ -126,7 +126,7 @@ public class ServiceService extends BaseService {
   public Response deleteService(@Context HttpHeaders headers, @Context UriInfo ui,
                                 @PathParam("serviceName") String serviceName) {
 
-    return handleRequest(headers, null, ui, Request.Type.DELETE, createResourceDefinition(serviceName, m_clusterName));
+    return handleRequest(headers, null, ui, org.apache.ambari.server.api.services.Request.Type.DELETE, createResourceDefinition(serviceName, m_clusterName));
   }
 
   /**

ambari-api/src/main/java/org/apache/ambari/api/services/UpdatePersistenceManager.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/UpdatePersistenceManager.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 import org.apache.ambari.server.AmbariException;
 
 

ambari-api/src/main/java/org/apache/ambari/api/services/parsers/JsonPropertyParser.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonPropertyParser.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services.parsers;
+package org.apache.ambari.server.api.services.parsers;
 
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;

ambari-api/src/main/java/org/apache/ambari/api/services/parsers/RequestBodyParser.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/RequestBodyParser.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services.parsers;
+package org.apache.ambari.server.api.services.parsers;
 
 import org.apache.ambari.server.controller.spi.PropertyId;
 

ambari-api/src/main/java/org/apache/ambari/api/services/serializers/JsonSerializer.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services.serializers;
+package org.apache.ambari.server.api.services.serializers;
 
-import org.apache.ambari.api.services.Result;
+import org.apache.ambari.server.api.services.Result;
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.api.util.TreeNode;
+import org.apache.ambari.server.api.util.TreeNode;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.util.DefaultPrettyPrinter;

ambari-api/src/main/java/org/apache/ambari/api/services/serializers/ResultSerializer.java → ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/ResultSerializer.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services.serializers;
+package org.apache.ambari.server.api.services.serializers;
 
 
-import org.apache.ambari.api.services.Result;
+import org.apache.ambari.server.api.services.Result;
 
 import javax.ws.rs.core.UriInfo;
 

ambari-api/src/main/java/org/apache/ambari/api/util/TreeNode.java → ambari-server/src/main/java/org/apache/ambari/server/api/util/TreeNode.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.util;
+package org.apache.ambari.server.api.util;
 
 import java.util.List;
 

ambari-api/src/main/java/org/apache/ambari/api/util/TreeNodeImpl.java → ambari-server/src/main/java/org/apache/ambari/server/api/util/TreeNodeImpl.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.util;
+package org.apache.ambari.server.api.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;

ambari-api/src/main/java/org/apache/ambari/api/controller/ganglia/GangliaHelper.java → ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHelper.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.ganglia;
+package org.apache.ambari.server.controller.ganglia;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;

ambari-api/src/main/java/org/apache/ambari/api/controller/ganglia/GangliaMetric.java → ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaMetric.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.ganglia;
+package org.apache.ambari.server.controller.ganglia;
 
 
 /**

ambari-api/src/main/java/org/apache/ambari/api/controller/ganglia/GangliaPropertyProvider.java → ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java

@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.ganglia;
+package org.apache.ambari.server.controller.ganglia;
 
-import org.apache.ambari.api.controller.internal.PropertyIdImpl;
+import org.apache.ambari.server.controller.internal.PropertyIdImpl;
 import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.PropertyProvider;
 import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.api.controller.utilities.PredicateHelper;
+import org.apache.ambari.server.controller.utilities.PredicateHelper;
 
 import java.util.HashMap;
 import java.util.HashSet;

ambari-api/src/main/java/org/apache/ambari/api/controller/internal/ClusterControllerImpl.java → ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
-import org.apache.ambari.api.controller.ProviderModule;
+import org.apache.ambari.server.controller.spi.ProviderModule;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.spi.ClusterController;
 import org.apache.ambari.server.controller.spi.Predicate;

ambari-api/src/main/java/org/apache/ambari/api/controller/internal/DefaultProviderModule.java → ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
-import org.apache.ambari.api.controller.ProviderModule;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.spi.ProviderModule;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.controller.AmbariManagementControllerImpl;
 import org.apache.ambari.server.controller.spi.PropertyProvider;

ambari-api/src/main/java/org/apache/ambari/api/controller/internal/PropertyIdImpl.java → ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyIdImpl.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import org.apache.ambari.server.controller.spi.PropertyId;
 

ambari-api/src/main/java/org/apache/ambari/api/controller/internal/PropertyPredicateVisitor.java → ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyPredicateVisitor.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import org.apache.ambari.server.controller.predicate.ArrayPredicate;
 import org.apache.ambari.server.controller.predicate.BasePredicate;

ambari-api/src/main/java/org/apache/ambari/api/controller/internal/RequestImpl.java → ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestImpl.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Request;

ambari-api/src/main/java/org/apache/ambari/api/controller/internal/ResourceImpl.java → ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;

ambari-api/src/main/java/org/apache/ambari/api/controller/internal/ResourceProviderImpl.java → ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceProviderImpl.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
-import org.apache.ambari.api.controller.utilities.PredicateHelper;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.utilities.PredicateHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.controller.ClusterRequest;

ambari-api/src/main/java/org/apache/ambari/api/controller/internal/SchemaImpl.java → ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SchemaImpl.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.PropertyProvider;

ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/ConnectionFactory.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/ConnectionFactory.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jdbc;
+package org.apache.ambari.server.controller.jdbc;
 
 import java.sql.Connection;
 import java.sql.SQLException;

ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/JDBCManagementController.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCManagementController.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jdbc;
+package org.apache.ambari.server.controller.jdbc;
 
-import org.apache.ambari.api.controller.internal.PropertyIdImpl;
-import org.apache.ambari.api.controller.internal.ResourceImpl;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.internal.PropertyIdImpl;
+import org.apache.ambari.server.controller.internal.ResourceImpl;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.controller.ClusterRequest;
@@ -42,7 +42,7 @@ import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.api.controller.utilities.PredicateHelper;
+import org.apache.ambari.server.controller.utilities.PredicateHelper;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;

ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/JDBCProviderModule.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCProviderModule.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jdbc;
+package org.apache.ambari.server.controller.jdbc;
 
-import org.apache.ambari.api.controller.ProviderModule;
-import org.apache.ambari.api.controller.utilities.DBHelper;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.spi.ProviderModule;
+import org.apache.ambari.server.controller.utilities.DBHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.PropertyProvider;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceProvider;

ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/JDBCResourceProvider.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java

@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jdbc;
+package org.apache.ambari.server.controller.jdbc;
 
-import org.apache.ambari.api.controller.internal.PropertyIdImpl;
-import org.apache.ambari.api.controller.internal.ResourceImpl;
-import org.apache.ambari.api.controller.internal.SchemaImpl;
-import org.apache.ambari.api.controller.utilities.PredicateHelper;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.internal.PropertyIdImpl;
+import org.apache.ambari.server.controller.internal.ResourceImpl;
+import org.apache.ambari.server.controller.internal.SchemaImpl;
+import org.apache.ambari.server.controller.utilities.PredicateHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.predicate.BasePredicate;
 import org.apache.ambari.server.controller.predicate.PredicateVisitorAcceptor;
 import org.apache.ambari.server.controller.spi.Predicate;

ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/SQLPredicateVisitor.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/SQLPredicateVisitor.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jdbc;
+package org.apache.ambari.server.controller.jdbc;
 
 import org.apache.ambari.server.controller.predicate.ArrayPredicate;
 import org.apache.ambari.server.controller.predicate.BasePredicate;

ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/SQLiteConnectionFactory.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/SQLiteConnectionFactory.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jdbc;
+package org.apache.ambari.server.controller.jdbc;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

ambari-api/src/main/java/org/apache/ambari/api/controller/jmx/JMXHelper.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXHelper.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jmx;
+package org.apache.ambari.server.controller.jmx;
 
 import org.codehaus.jackson.map.ObjectMapper;
 

ambari-api/src/main/java/org/apache/ambari/api/controller/jmx/JMXMetrics.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXMetrics.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jmx;
+package org.apache.ambari.server.controller.jmx;
 
 import java.util.List;
 import java.util.Map;

ambari-api/src/main/java/org/apache/ambari/api/controller/jmx/JMXPropertyProvider.java → ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java

@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jmx;
+package org.apache.ambari.server.controller.jmx;
 
-import org.apache.ambari.api.controller.internal.PropertyIdImpl;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.internal.PropertyIdImpl;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.PropertyProvider;
 import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.api.controller.utilities.PredicateHelper;
+import org.apache.ambari.server.controller.utilities.PredicateHelper;
 
 import java.util.HashMap;
 import java.util.HashSet;

ambari-api/src/main/java/org/apache/ambari/api/controller/ProviderModule.java → ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ProviderModule.java

@@ -16,15 +16,18 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller;
-
-import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.ResourceProvider;
-
+package org.apache.ambari.server.controller.spi;
 
 /**
- *
+ *  Interface to allow the plugging in of resource adapters.
  */
 public interface ProviderModule {
+  /**
+   * Get a resource adapter for the given resource type.
+   *
+   * @param type  the resource type
+   *
+   * @return the resource adapter
+   */
   public ResourceProvider getResourceProvider(Resource.Type type);
 }

ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/ClusterControllerHelper.java → ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ClusterControllerHelper.java

@@ -16,11 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.utilities;
+package org.apache.ambari.server.controller.utilities;
 
-import org.apache.ambari.api.controller.ProviderModule;
-import org.apache.ambari.api.controller.internal.ClusterControllerImpl;
-import org.apache.ambari.api.controller.internal.DefaultProviderModule;
+import org.apache.ambari.server.controller.spi.ProviderModule;
+import org.apache.ambari.server.controller.internal.ClusterControllerImpl;
 import org.apache.ambari.server.controller.spi.ClusterController;
 
 /**
@@ -29,7 +28,7 @@ import org.apache.ambari.server.controller.spi.ClusterController;
 public class ClusterControllerHelper {
 
   private static String PROVIDER_MODULE_CLASS = System.getProperty("provider.module.class",
-      "org.apache.ambari.api.controller.internal.DefaultProviderModule");
+      "org.apache.ambari.server.controller.internal.DefaultProviderModule");
 
   private static ClusterController controller;
 

ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/DBHelper.java → ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DBHelper.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ambari.api.controller.utilities;
+package org.apache.ambari.server.controller.utilities;
 
-import org.apache.ambari.api.controller.jdbc.ConnectionFactory;
-import org.apache.ambari.api.controller.jdbc.SQLiteConnectionFactory;
+import org.apache.ambari.server.controller.jdbc.ConnectionFactory;
+import org.apache.ambari.server.controller.jdbc.SQLiteConnectionFactory;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
 

ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/PredicateBuilder.java → ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ambari.api.controller.utilities;
+package org.apache.ambari.server.controller.utilities;
 
-import org.apache.ambari.api.controller.internal.PropertyIdImpl;
+import org.apache.ambari.server.controller.internal.PropertyIdImpl;
 import org.apache.ambari.server.controller.predicate.AndPredicate;
 import org.apache.ambari.server.controller.predicate.BasePredicate;
 import org.apache.ambari.server.controller.predicate.Comparables;

ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/PredicateHelper.java → ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateHelper.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ambari.api.controller.utilities;
+package org.apache.ambari.server.controller.utilities;
 
 import org.apache.ambari.server.controller.predicate.BasePredicate;
 import org.apache.ambari.server.controller.predicate.PredicateVisitor;

ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/PropertyHelper.java → ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ambari.api.controller.utilities;
+package org.apache.ambari.server.controller.utilities;
 
-import org.apache.ambari.api.controller.internal.PropertyIdImpl;
-import org.apache.ambari.api.controller.internal.RequestImpl;
+import org.apache.ambari.server.controller.internal.PropertyIdImpl;
+import org.apache.ambari.server.controller.internal.RequestImpl;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.Resource;

ambari-api/src/test/java/org/apache/ambari/api/TestSuite.java → ambari-server/src/test/java/org/apache/ambari/server/api/TestSuite.java

@@ -1,12 +1,12 @@
-package org.apache.ambari.api;
+package org.apache.ambari.server.api;
 
 /**
  * All unit tests.
  */
 
-import org.apache.ambari.api.handlers.*;
-import org.apache.ambari.api.services.*;
-import org.apache.ambari.api.services.parsers.JsonPropertyParserTest;
+import org.apache.ambari.server.api.handlers.*;
+import org.apache.ambari.server.api.services.*;
+import org.apache.ambari.server.api.services.parsers.JsonPropertyParserTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 

ambari-api/src/test/java/org/apache/ambari/api/handlers/CreateHandlerTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/handlers/CreateHandlerTest.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.PersistenceManager;
-import org.apache.ambari.api.services.Request;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.PersistenceManager;
+import org.apache.ambari.server.api.services.Request;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.junit.Test;
 import static org.junit.Assert.assertNotNull;

ambari-api/src/test/java/org/apache/ambari/api/handlers/DelegatingRequestHandlerTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DelegatingRequestHandlerTest.java

@@ -1,8 +1,8 @@
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.services.Request;
-import org.apache.ambari.api.services.Result;
-import org.apache.ambari.api.services.ResultPostProcessor;
+import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.api.services.Result;
+import org.apache.ambari.server.api.services.ResultPostProcessor;
 import org.junit.Test;
 
 import static org.easymock.EasyMock.*;

ambari-api/src/test/java/org/apache/ambari/api/handlers/DeleteHandlerTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DeleteHandlerTest.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.PersistenceManager;
-import org.apache.ambari.api.services.Request;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.PersistenceManager;
+import org.apache.ambari.server.api.services.Request;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.junit.Test;
 import static org.junit.Assert.assertNotNull;

ambari-api/src/test/java/org/apache/ambari/api/handlers/ReadHandlerTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.query.Query;
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.Request;
-import org.apache.ambari.api.services.Result;
+import org.apache.ambari.server.api.query.Query;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.api.services.Result;
 import org.junit.Test;
 
 

ambari-api/src/test/java/org/apache/ambari/api/handlers/UpdateHandlerTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/handlers/UpdateHandlerTest.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.handlers;
+package org.apache.ambari.server.api.handlers;
 
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.PersistenceManager;
-import org.apache.ambari.api.services.Request;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.PersistenceManager;
+import org.apache.ambari.server.api.services.Request;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.junit.Test;
 import static org.junit.Assert.assertNotNull;

ambari-api/src/test/java/org/apache/ambari/api/query/QueryImplTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryImplTest.java

@@ -1,10 +1,10 @@
-package org.apache.ambari.api.query;
+package org.apache.ambari.server.api.query;
 
-//import org.apache.ambari.api.controller.internal.PropertyIdImpl;
-//import org.apache.ambari.api.controller.utilities.PredicateBuilder;
-//import org.apache.ambari.api.resources.ResourceDefinition;
-//import org.apache.ambari.api.services.Request;
-//import org.apache.ambari.api.services.Result;
+//import org.apache.ambari.server.controller.internal.PropertyIdImpl;
+//import org.apache.ambari.server.controller.utilities.PredicateBuilder;
+//import org.apache.ambari.server.api.resources.ResourceDefinition;
+//import org.apache.ambari.server.api.services.Request;
+//import org.apache.ambari.server.api.services.Result;
 //import org.apache.ambari.server.controller.spi.ClusterController;
 //import org.apache.ambari.server.controller.spi.Predicate;
 //import org.apache.ambari.server.controller.spi.Resource;

ambari-api/src/test/java/org/apache/ambari/api/services/ClusterServiceTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java

@@ -1,8 +1,8 @@
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.handlers.RequestHandler;
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.handlers.RequestHandler;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.serializers.ResultSerializer;
 import org.junit.Test;
 
 import javax.ws.rs.core.HttpHeaders;

ambari-api/src/test/java/org/apache/ambari/api/services/ComponentServiceTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java

@@ -1,9 +1,9 @@
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 
-import org.apache.ambari.api.handlers.RequestHandler;
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.handlers.RequestHandler;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.serializers.ResultSerializer;
 import org.junit.Test;
 
 import javax.ws.rs.core.HttpHeaders;

ambari-api/src/test/java/org/apache/ambari/api/services/CreatePersistenceManagerTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/CreatePersistenceManagerTest.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.ClusterController;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;

ambari-api/src/test/java/org/apache/ambari/api/services/DeletePersistenceManagerTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/DeletePersistenceManagerTest.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 
-import org.apache.ambari.api.query.Query;
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.query.Query;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
 import org.apache.ambari.server.controller.spi.*;
 import org.junit.Test;
 

ambari-api/src/test/java/org/apache/ambari/api/services/HostComponentServiceTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java

@@ -1,8 +1,8 @@
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.handlers.RequestHandler;
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.handlers.RequestHandler;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.serializers.ResultSerializer;
 import org.junit.Test;
 
 import javax.ws.rs.core.HttpHeaders;

ambari-api/src/test/java/org/apache/ambari/api/services/HostServiceTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java

@@ -1,9 +1,9 @@
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 
-import org.apache.ambari.api.handlers.RequestHandler;
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.handlers.RequestHandler;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.serializers.ResultSerializer;
 import org.junit.Test;
 
 import javax.ws.rs.core.HttpHeaders;

ambari-api/src/test/java/org/apache/ambari/api/services/ServiceServiceTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java

@@ -1,8 +1,8 @@
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
-import org.apache.ambari.api.handlers.RequestHandler;
-import org.apache.ambari.api.resources.ResourceDefinition;
-import org.apache.ambari.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.handlers.RequestHandler;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.services.serializers.ResultSerializer;
 import org.junit.Test;
 
 import javax.ws.rs.core.HttpHeaders;

ambari-api/src/test/java/org/apache/ambari/api/services/UpdatePersistenceManagerTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/UpdatePersistenceManagerTest.java

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services;
+package org.apache.ambari.server.api.services;
 
 
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
-import org.apache.ambari.api.query.Query;
-import org.apache.ambari.api.resources.ResourceDefinition;
+import org.apache.ambari.server.api.resources.ResourceDefinition;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.api.query.Query;
 import org.apache.ambari.server.controller.spi.*;
 import org.junit.Test;
 

ambari-api/src/test/java/org/apache/ambari/api/services/parsers/JsonPropertyParserTest.java → ambari-server/src/test/java/org/apache/ambari/server/api/services/parsers/JsonPropertyParserTest.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.services.parsers;
+package org.apache.ambari.server.api.services.parsers;
 
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;

ambari-api/src/test/java/org/apache/ambari/api/controller/ganglia/GangliaHelperTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaHelperTest.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ambari.api.controller.ganglia;
+package org.apache.ambari.server.controller.ganglia;
 
 import org.junit.Ignore;
 import org.junit.Test;

ambari-api/src/test/java/org/apache/ambari/api/controller/ganglia/GangliaPropertyProviderTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ambari.api.controller.ganglia;
+package org.apache.ambari.server.controller.ganglia;
 
 import org.junit.Ignore;
 import org.junit.Test;

ambari-api/src/test/java/org/apache/ambari/api/controller/internal/ClusterControllerImplTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import junit.framework.Assert;
-import org.apache.ambari.api.controller.ProviderModule;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.spi.ProviderModule;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.ClusterController;
 import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.PropertyId;
@@ -29,7 +29,7 @@ import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.controller.spi.Schema;
-import org.apache.ambari.api.controller.utilities.PredicateBuilder;
+import org.apache.ambari.server.controller.utilities.PredicateBuilder;
 import org.junit.Test;
 
 import java.util.HashMap;

ambari-api/src/test/java/org/apache/ambari/api/controller/internal/PropertyIdImplTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PropertyIdImplTest.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import junit.framework.Assert;
 import org.apache.ambari.server.controller.spi.PropertyId;

ambari-api/src/test/java/org/apache/ambari/api/controller/internal/RequestImplTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import junit.framework.Assert;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Request;
 import org.junit.Test;

ambari-api/src/test/java/org/apache/ambari/api/controller/internal/ResourceImplTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceImplTest.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import junit.framework.Assert;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.junit.Test;

ambari-api/src/test/java/org/apache/ambari/api/controller/internal/ResourceProviderImplTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceProviderImplTest.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
-import org.apache.ambari.api.controller.utilities.PredicateBuilder;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.utilities.PredicateBuilder;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.controller.ClusterRequest;
 import org.apache.ambari.server.controller.ClusterResponse;

ambari-api/src/test/java/org/apache/ambari/api/controller/internal/SchemaImplTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.internal;
+package org.apache.ambari.server.controller.internal;
 
 import junit.framework.Assert;
-import org.apache.ambari.api.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.PropertyId;
 import org.apache.ambari.server.controller.spi.PropertyProvider;

ambari-api/src/test/java/org/apache/ambari/api/controller/jdbc/JDBCManagementControllerTest.java → ambari-server/src/test/java/org/apache/ambari/server/controller/jdbc/JDBCManagementControllerTest.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.ambari.api.controller.jdbc;
+package org.apache.ambari.server.controller.jdbc;
 
 import static org.easymock.EasyMock.createNiceMock;