rename base package name 2 com.ctrip.framework.apollo

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/AdminServiceApplication.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceApplication.java

-package com.ctrip.apollo.adminservice;
+package com.ctrip.framework.apollo.adminservice;
+
+import com.ctrip.framework.apollo.biz.ApolloBizConfig;
+import com.ctrip.framework.apollo.common.ApolloCommonConfig;
 
 import org.springframework.boot.actuate.system.ApplicationPidFileWriter;
 import org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter;
@@ -18,9 +21,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @PropertySource(value = {"classpath:adminservice.properties"})
 @EnableAutoConfiguration
 @EnableTransactionManagement
-@ComponentScan(basePackageClasses = {com.ctrip.apollo.common.ApolloCommonConfig.class,
-    com.ctrip.apollo.biz.ApolloBizConfig.class,
-    com.ctrip.apollo.adminservice.AdminServiceApplication.class})
+@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
+    ApolloBizConfig.class,
+    AdminServiceApplication.class})
 public class AdminServiceApplication {
   public static void main(String[] args) {
     ConfigurableApplicationContext context =

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/AdminServiceHealthIndicator.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceHealthIndicator.java

-package com.ctrip.apollo.adminservice;
+package com.ctrip.framework.apollo.adminservice;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.health.Health;
@@ -6,7 +6,7 @@ import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
 
-import com.ctrip.apollo.biz.service.AppService;
+import com.ctrip.framework.apollo.biz.service.AppService;
 
 @Component
 public class AdminServiceHealthIndicator implements HealthIndicator {

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/AppController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import java.util.List;
 
@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.biz.service.AdminService;
-import com.ctrip.apollo.biz.service.AppService;
-import com.ctrip.apollo.common.auth.ActiveUser;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.exception.NotFoundException;
-import com.ctrip.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.service.AdminService;
+import com.ctrip.framework.apollo.biz.service.AppService;
+import com.ctrip.framework.apollo.common.auth.ActiveUser;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 @RestController
 public class AppController {

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/AppNamespaceController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.apollo.biz.entity.AppNamespace;
-import com.ctrip.apollo.biz.service.AppNamespaceService;
-import com.ctrip.apollo.common.auth.ActiveUser;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.dto.AppNamespaceDTO;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.biz.service.AppNamespaceService;
+import com.ctrip.framework.apollo.common.auth.ActiveUser;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.dto.AppNamespaceDTO;
 
 import java.util.List;
 

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/ClusterController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ClusterController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import java.util.List;
 
@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.apollo.biz.entity.Cluster;
-import com.ctrip.apollo.biz.service.ClusterService;
-import com.ctrip.apollo.common.auth.ActiveUser;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.dto.ClusterDTO;
-import com.ctrip.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.biz.entity.Cluster;
+import com.ctrip.framework.apollo.biz.service.ClusterService;
+import com.ctrip.framework.apollo.common.auth.ActiveUser;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.dto.ClusterDTO;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
 
 @RestController
 public class ClusterController {

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/IndexController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/IndexController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/ItemController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.apollo.biz.entity.Item;
-import com.ctrip.apollo.biz.service.ItemService;
-import com.ctrip.apollo.common.auth.ActiveUser;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.biz.entity.Item;
+import com.ctrip.framework.apollo.biz.service.ItemService;
+import com.ctrip.framework.apollo.common.auth.ActiveUser;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
 
 @RestController
 public class ItemController {

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/ItemSetController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.apollo.biz.service.ItemSetService;
-import com.ctrip.apollo.common.auth.ActiveUser;
-import com.ctrip.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.biz.service.ItemSetService;
+import com.ctrip.framework.apollo.common.auth.ActiveUser;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
 
 @RestController
 public class ItemSetController {

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/NamespaceController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import java.util.List;
 
@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.biz.service.NamespaceService;
-import com.ctrip.apollo.common.auth.ActiveUser;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
-import com.ctrip.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.service.NamespaceService;
+import com.ctrip.framework.apollo.common.auth.ActiveUser;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
 
 @RestController
 public class NamespaceController {
@@ -25,8 +25,8 @@ public class NamespaceController {
 
   @RequestMapping(path = "/apps/{appId}/clusters/{clusterName}/namespaces", method = RequestMethod.POST)
   public NamespaceDTO createOrUpdate(@PathVariable("appId") String appId,
-      @PathVariable("clusterName") String clusterName, @RequestBody NamespaceDTO dto,
-      @ActiveUser UserDetails user) {
+                                     @PathVariable("clusterName") String clusterName, @RequestBody NamespaceDTO dto,
+                                     @ActiveUser UserDetails user) {
     Namespace entity = BeanUtils.transfrom(Namespace.class, dto);
     Namespace managedEntity = namespaceService.findOne(appId, clusterName, entity.getNamespaceName());
     if (managedEntity != null) {

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/PrivilegeController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/PrivilegeController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/ReleaseController.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import com.google.common.base.Joiner;
 
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.biz.entity.Release;
-import com.ctrip.apollo.biz.message.MessageSender;
-import com.ctrip.apollo.biz.message.Topics;
-import com.ctrip.apollo.biz.service.ConfigService;
-import com.ctrip.apollo.biz.service.NamespaceService;
-import com.ctrip.apollo.biz.service.ReleaseService;
-import com.ctrip.apollo.common.auth.ActiveUser;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ReleaseDTO;
-import com.ctrip.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.entity.Release;
+import com.ctrip.framework.apollo.biz.message.MessageSender;
+import com.ctrip.framework.apollo.biz.message.Topics;
+import com.ctrip.framework.apollo.biz.service.ConfigService;
+import com.ctrip.framework.apollo.biz.service.NamespaceService;
+import com.ctrip.framework.apollo.biz.service.ReleaseService;
+import com.ctrip.framework.apollo.common.auth.ActiveUser;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;

apollo-adminservice/src/test/java/com/ctrip/apollo/AdminServiceTestConfiguration.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/AdminServiceTestConfiguration.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
-import com.ctrip.apollo.common.controller.HttpMessageConverterConfiguration;
+import com.ctrip.framework.apollo.common.controller.HttpMessageConverterConfiguration;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
-import com.ctrip.apollo.adminservice.AdminServiceApplication;
+import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
 
 @Configuration
 @ComponentScan(excludeFilters = {@Filter(type = FilterType.ASSIGNABLE_TYPE, value = {

apollo-adminservice/src/test/java/com/ctrip/apollo/LocalAdminServiceApplication.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/LocalAdminServiceApplication.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/AllTests.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/AllTests.java

-package com.ctrip.apollo.adminservice;
+package com.ctrip.framework.apollo.adminservice;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import com.ctrip.apollo.adminservice.controller.AppControllerTest;
-import com.ctrip.apollo.adminservice.controller.ControllerExceptionTest;
-import com.ctrip.apollo.adminservice.controller.ControllerIntegrationExceptionTest;
-import com.ctrip.apollo.adminservice.controller.ItemSetControllerTest;
-import com.ctrip.apollo.adminservice.controller.ReleaseControllerTest;
+import com.ctrip.framework.apollo.adminservice.controller.AppControllerTest;
+import com.ctrip.framework.apollo.adminservice.controller.ControllerExceptionTest;
+import com.ctrip.framework.apollo.adminservice.controller.ControllerIntegrationExceptionTest;
+import com.ctrip.framework.apollo.adminservice.controller.ItemSetControllerTest;
+import com.ctrip.framework.apollo.adminservice.controller.ReleaseControllerTest;
 
 @RunWith(Suite.class)
 @SuiteClasses({AppControllerTest.class, ReleaseControllerTest.class, ItemSetControllerTest.class,
-    ControllerExceptionTest.class, ControllerIntegrationExceptionTest.class})
+               ControllerExceptionTest.class, ControllerIntegrationExceptionTest.class})
 public class AllTests {
 
 }

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/AbstractControllerTest.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AbstractControllerTest.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import javax.annotation.PostConstruct;
 
@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
-import com.ctrip.apollo.AdminServiceTestConfiguration;
+import com.ctrip.framework.apollo.AdminServiceTestConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = AdminServiceTestConfiguration.class)

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/AppControllerTest.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppControllerTest.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -9,10 +9,10 @@ import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.biz.repository.AppRepository;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.repository.AppRepository;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
 
 public class AppControllerTest extends AbstractControllerTest {
 

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/AppNamespaceControllerTest.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceControllerTest.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
-import com.ctrip.apollo.biz.entity.AppNamespace;
-import com.ctrip.apollo.biz.repository.AppNamespaceRepository;
-import com.ctrip.apollo.core.dto.AppNamespaceDTO;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
+import com.ctrip.framework.apollo.core.dto.AppNamespaceDTO;
 
 import org.junit.Assert;
 import org.junit.Test;

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ControllerExceptionTest.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerExceptionTest.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
@@ -19,12 +19,12 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.biz.service.AdminService;
-import com.ctrip.apollo.biz.service.AppService;
-import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.exception.NotFoundException;
-import com.ctrip.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.service.AdminService;
+import com.ctrip.framework.apollo.biz.service.AppService;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ControllerExceptionTest {

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ControllerIntegrationExceptionTest.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerIntegrationExceptionTest.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
@@ -16,10 +16,11 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.client.HttpStatusCodeException;
 
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.biz.service.AdminService;
-import com.ctrip.apollo.biz.service.AppService;
-import com.ctrip.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.service.AdminService;
+import com.ctrip.framework.apollo.biz.service.AppService;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+
 import com.google.gson.Gson;
 
 public class ControllerIntegrationExceptionTest extends AbstractControllerTest {

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ItemSetControllerTest.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetControllerTest.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import java.util.List;
 
@@ -12,13 +12,13 @@ import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.web.client.RestTemplate;
 
-import com.ctrip.apollo.biz.entity.Item;
-import com.ctrip.apollo.biz.repository.ItemRepository;
-import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.dto.ClusterDTO;
-import com.ctrip.apollo.core.dto.ItemChangeSets;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.biz.entity.Item;
+import com.ctrip.framework.apollo.biz.repository.ItemRepository;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.core.dto.ClusterDTO;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 
 public class ItemSetControllerTest extends AbstractControllerTest {
 

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ReleaseControllerTest.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseControllerTest.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import com.google.common.base.Joiner;
 import com.google.gson.Gson;
 
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.biz.message.MessageSender;
-import com.ctrip.apollo.biz.message.Topics;
-import com.ctrip.apollo.biz.repository.ReleaseRepository;
-import com.ctrip.apollo.biz.service.NamespaceService;
-import com.ctrip.apollo.biz.service.ReleaseService;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.dto.ClusterDTO;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
-import com.ctrip.apollo.core.dto.ReleaseDTO;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.message.MessageSender;
+import com.ctrip.framework.apollo.biz.message.Topics;
+import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
+import com.ctrip.framework.apollo.biz.service.NamespaceService;
+import com.ctrip.framework.apollo.biz.service.ReleaseService;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.core.dto.ClusterDTO;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
 
 import org.junit.Assert;
 import org.junit.Test;

apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/TestWebSecurityConfig.java → apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/TestWebSecurityConfig.java

-package com.ctrip.apollo.adminservice.controller;
+package com.ctrip.framework.apollo.adminservice.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

apollo-adminservice/src/test/resources/META-INF/plexus/plexus.xml

@@ -2,17 +2,17 @@
 	<components>
 		<component>
 			<role>com.dianping.cat.configuration.ClientConfigManager</role>
-			<implementation>com.ctrip.apollo.cat.NullClientConfigManager
+			<implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
 			</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.io.TransportManager</role>
-			<implementation>com.ctrip.apollo.cat.NullTransportManager
+			<implementation>com.ctrip.framework.apollo.cat.NullTransportManager
 			</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageManager</role>
-			<implementation>com.ctrip.apollo.cat.NullMessageManager
+			<implementation>com.ctrip.framework.apollo.cat.NullMessageManager
 			</implementation>
 			<requirements>
 				<requirement>
@@ -22,7 +22,7 @@
 		</component>
 		<component>
 			<role>com.dianping.cat.message.MessageProducer</role>
-			<implementation>com.ctrip.apollo.cat.NullMessageProducer
+			<implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
 			</implementation>
 			<requirements>
 				<requirement>
@@ -35,8 +35,8 @@
 		</component>
 		<component>
 			<role>org.codehaus.plexus.logging.LoggerManager</role>
-			<implementation>com.ctrip.apollo.cat.NullLoggerManager
+			<implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
 			</implementation>
 		</component>
 	</components>
-</plexus>
+</plexus>
\ No newline at end of file

apollo-assembly/src/main/java/com/ctrip/apollo/assembly/ApolloApplication.java → apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java

-package com.ctrip.apollo.assembly;
+package com.ctrip.framework.apollo.assembly;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,9 +10,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import com.ctrip.apollo.adminservice.AdminServiceApplication;
-import com.ctrip.apollo.configservice.ConfigServiceApplication;
-import com.ctrip.apollo.portal.PortalApplication;
+import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
+import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
+import com.ctrip.framework.apollo.portal.PortalApplication;
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
     HibernateJpaAutoConfiguration.class})

apollo-assembly/src/test/java/com/ctrip/apollo/assembly/LocalApolloApplication.java → apollo-assembly/src/test/java/com/ctrip/framework/apollo/assembly/LocalApolloApplication.java

-package com.ctrip.apollo.assembly;
+package com.ctrip.framework.apollo.assembly;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,9 +10,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import com.ctrip.apollo.adminservice.AdminServiceApplication;
-import com.ctrip.apollo.configservice.ConfigServiceApplication;
-import com.ctrip.apollo.portal.PortalApplication;
+import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
+import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
+import com.ctrip.framework.apollo.portal.PortalApplication;
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
     HibernateJpaAutoConfiguration.class})

apollo-biz/src/main/java/com/ctrip/apollo/biz/ApolloBizConfig.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/ApolloBizConfig.java

-package com.ctrip.apollo.biz;
+package com.ctrip.framework.apollo.biz;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 
 @EnableAutoConfiguration
 @Configuration
-@ComponentScan(basePackageClasses = com.ctrip.apollo.biz.ApolloBizConfig.class)
+@ComponentScan(basePackageClasses = ApolloBizConfig.class)
 public class ApolloBizConfig {
 
 }

apollo-biz/src/main/java/com/ctrip/apollo/biz/aop/RepositoryAspect.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/aop/RepositoryAspect.java

-package com.ctrip.apollo.biz.aop;
+package com.ctrip.framework.apollo.biz.aop;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.message.Message;

apollo-biz/src/main/java/com/ctrip/apollo/biz/customize/LoggingCustomizer.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/LoggingCustomizer.java

-package com.ctrip.apollo.biz.customize;
+package com.ctrip.framework.apollo.biz.customize;
 
 import com.google.common.base.Strings;
 
-import com.ctrip.apollo.biz.entity.ServerConfig;
-import com.ctrip.apollo.biz.repository.ServerConfigRepository;
+import com.ctrip.framework.apollo.biz.entity.ServerConfig;
+import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository;
 import com.ctrip.framework.foundation.Foundation;
 import com.dianping.cat.Cat;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/customize/TomcatContainerCustomizer.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/TomcatContainerCustomizer.java

-package com.ctrip.apollo.biz.customize;
+package com.ctrip.framework.apollo.biz.customize;
 
 import org.apache.catalina.connector.Connector;
 import org.apache.coyote.ProtocolHandler;

apollo-biz/src/main/java/com/ctrip/apollo/biz/datasource/TitanCondition.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanCondition.java

-package com.ctrip.apollo.biz.datasource;
+package com.ctrip.framework.apollo.biz.datasource;
 
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
-import com.ctrip.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 public class TitanCondition implements Condition {
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/datasource/TitanEntityManager.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanEntityManager.java

-package com.ctrip.apollo.biz.datasource;
+package com.ctrip.framework.apollo.biz.datasource;
 
 import java.lang.reflect.Method;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/datasource/TitanSettings.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanSettings.java

-package com.ctrip.apollo.biz.datasource;
+package com.ctrip.framework.apollo.biz.datasource;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.enums.EnvUtils;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.enums.EnvUtils;
 import com.ctrip.framework.foundation.Foundation;
 
 @Component

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/App.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/App.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/AppNamespace.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/AppNamespace.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Audit.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Audit.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/BaseEntity.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/BaseEntity.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import java.util.Date;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Cluster.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Commit.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Item.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Namespace.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Namespace.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Privilege.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Privilege.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Release.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Release.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/ReleaseMessage.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ReleaseMessage.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import java.util.Date;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/ServerConfig.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServerConfig.java

-package com.ctrip.apollo.biz.entity;
+package com.ctrip.framework.apollo.biz.entity;
 
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;

apollo-biz/src/main/java/com/ctrip/apollo/biz/eureka/ApolloEurekaClientConfig.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/eureka/ApolloEurekaClientConfig.java

-package com.ctrip.apollo.biz.eureka;
+package com.ctrip.framework.apollo.biz.eureka;
 
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 
-import com.ctrip.apollo.biz.entity.ServerConfig;
-import com.ctrip.apollo.biz.repository.ServerConfigRepository;
+import com.ctrip.framework.apollo.biz.entity.ServerConfig;
+import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;

apollo-biz/src/main/java/com/ctrip/apollo/biz/message/DatabaseMessageSender.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/DatabaseMessageSender.java

-package com.ctrip.apollo.biz.message;
+package com.ctrip.framework.apollo.biz.message;
 
-import com.ctrip.apollo.biz.entity.ReleaseMessage;
-import com.ctrip.apollo.biz.repository.ReleaseMessageRepository;
+import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
+import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
 import com.dianping.cat.Cat;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;

apollo-biz/src/main/java/com/ctrip/apollo/biz/message/MessageListener.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/MessageListener.java

-package com.ctrip.apollo.biz.message;
+package com.ctrip.framework.apollo.biz.message;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-biz/src/main/java/com/ctrip/apollo/biz/message/MessageSender.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/MessageSender.java

-package com.ctrip.apollo.biz.message;
+package com.ctrip.framework.apollo.biz.message;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-biz/src/main/java/com/ctrip/apollo/biz/message/ReleaseMessageScanner.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScanner.java

-package com.ctrip.apollo.biz.message;
+package com.ctrip.framework.apollo.biz.message;
 
 import com.google.common.collect.Lists;
 
-import com.ctrip.apollo.biz.entity.ReleaseMessage;
-import com.ctrip.apollo.biz.repository.ReleaseMessageRepository;
-import com.ctrip.apollo.core.utils.ApolloThreadFactory;
+import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
+import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
+import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
 import com.dianping.cat.Cat;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;

apollo-biz/src/main/java/com/ctrip/apollo/biz/message/Topics.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/Topics.java

-package com.ctrip.apollo.biz.message;
+package com.ctrip.framework.apollo.biz.message;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/AppNamespaceRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppNamespaceRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ctrip.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
 
 import java.util.List;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/AppRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 
-import com.ctrip.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.entity.App;
 
 public interface AppRepository extends PagingAndSortingRepository<App, Long> {
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/AuditRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AuditRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 
-import com.ctrip.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.entity.Audit;
 
 public interface AuditRepository extends PagingAndSortingRepository<Audit, Long> {
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/ClusterRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ClusterRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 
-import com.ctrip.apollo.biz.entity.Cluster;
+import com.ctrip.framework.apollo.biz.entity.Cluster;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/CommitRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/CommitRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
-import com.ctrip.apollo.biz.entity.Commit;
+import com.ctrip.framework.apollo.biz.entity.Commit;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/ItemRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ItemRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 import java.util.List;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ctrip.apollo.biz.entity.Item;
+import com.ctrip.framework.apollo.biz.entity.Item;
 
 public interface ItemRepository extends PagingAndSortingRepository<Item, Long> {
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/NamespaceRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/NamespaceRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 import java.util.List;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ctrip.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
 
 public interface NamespaceRepository extends PagingAndSortingRepository<Namespace, Long> {
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/PrivilegeRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/PrivilegeRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ctrip.apollo.biz.entity.Privilege;
+import com.ctrip.framework.apollo.biz.entity.Privilege;
 
 import java.util.List;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/ReleaseMessageRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseMessageRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
-import com.ctrip.apollo.biz.entity.ReleaseMessage;
+import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/ReleaseRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 import java.util.List;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 
-import com.ctrip.apollo.biz.entity.Release;
+import com.ctrip.framework.apollo.biz.entity.Release;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/ServerConfigRepository.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ServerConfigRepository.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
-import com.ctrip.apollo.biz.entity.ServerConfig;
+import com.ctrip.framework.apollo.biz.entity.ServerConfig;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AdminService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AdminService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.entity.App;
 
 @Service
 public class AdminService {

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AppNamespaceService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import com.google.common.base.Preconditions;
 
@@ -9,13 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.entity.AppNamespace;
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.repository.AppNamespaceRepository;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.exception.ServiceException;
-import com.ctrip.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 @Service
 public class AppNamespaceService {

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AppService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.List;
 import java.util.Objects;
@@ -9,11 +9,11 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.repository.AppRepository;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.repository.AppRepository;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
 
 @Service
 public class AppService {

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AuditService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AuditService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.List;
 
@@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.repository.AuditRepository;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.repository.AuditRepository;
 
 @Service
 public class AuditService {

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ClusterService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ClusterService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.Collections;
 import java.util.List;
@@ -8,12 +8,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.entity.Cluster;
-import com.ctrip.apollo.biz.repository.ClusterRepository;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.entity.Cluster;
+import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
+
 import com.google.common.base.Strings;
 
 @Service
@@ -55,7 +56,7 @@ public class ClusterService {
     Cluster cluster = clusterRepository.save(entity);
 
     auditService.audit(Cluster.class.getSimpleName(), cluster.getId(), Audit.OP.INSERT,
-        cluster.getDataChangeCreatedBy());
+                       cluster.getDataChangeCreatedBy());
 
     return cluster;
   }

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/CommitService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/CommitService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
-import com.ctrip.apollo.biz.entity.Commit;
-import com.ctrip.apollo.biz.repository.CommitRepository;
+import com.ctrip.framework.apollo.biz.entity.Commit;
+import com.ctrip.framework.apollo.biz.repository.CommitRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ConfigService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ConfigService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
-import com.ctrip.apollo.biz.entity.Release;
-import com.ctrip.apollo.biz.repository.ReleaseRepository;
+import com.ctrip.framework.apollo.biz.entity.Release;
+import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ItemService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.Collections;
 import java.util.List;
@@ -7,13 +7,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.entity.Item;
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.biz.repository.ItemRepository;
-import com.ctrip.apollo.biz.repository.NamespaceRepository;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.entity.Item;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.repository.ItemRepository;
+import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
 
 @Service
 public class ItemService {

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ItemSetService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemSetService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.entity.Item;
-import com.ctrip.apollo.biz.repository.ItemRepository;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.dto.ItemChangeSets;
-import com.ctrip.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.entity.Item;
+import com.ctrip.framework.apollo.biz.repository.ItemRepository;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
 
 @Service
 public class ItemSetService {

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/NamespaceService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/NamespaceService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.Collections;
 import java.util.List;
@@ -8,12 +8,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.biz.repository.NamespaceRepository;
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
 
 @Service
 public class NamespaceService {

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/PrivilegeService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/PrivilegeService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.entity.Privilege;
-import com.ctrip.apollo.biz.repository.PrivilegeRepository;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.entity.Privilege;
+import com.ctrip.framework.apollo.biz.repository.PrivilegeRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ReleaseService.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import com.google.gson.Gson;
 
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.entity.Item;
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.biz.entity.Release;
-import com.ctrip.apollo.biz.repository.ItemRepository;
-import com.ctrip.apollo.biz.repository.ReleaseRepository;
-import com.ctrip.apollo.biz.utils.ReleaseKeyGenerator;
-import com.ctrip.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.entity.Item;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.entity.Release;
+import com.ctrip.framework.apollo.biz.repository.ItemRepository;
+import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
+import com.ctrip.framework.apollo.biz.utils.ReleaseKeyGenerator;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/EntityManagerUtil.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/EntityManagerUtil.java

-package com.ctrip.apollo.biz.utils;
+package com.ctrip.framework.apollo.biz.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/ReleaseKeyGenerator.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ReleaseKeyGenerator.java

-package com.ctrip.apollo.biz.utils;
+package com.ctrip.framework.apollo.biz.utils;
 
 import com.google.common.base.Joiner;
 
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.core.utils.ByteUtil;
-import com.ctrip.apollo.core.utils.MachineUtil;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.core.utils.ByteUtil;
+import com.ctrip.framework.apollo.core.utils.MachineUtil;
 
 import java.security.SecureRandom;
 import java.text.DateFormat;
@@ -32,7 +32,7 @@ public class ReleaseKeyGenerator {
         ByteUtil.toHexString(
             toByteArray(Objects.hash(namespace.getAppId(), namespace.getClusterName(),
                 namespace.getNamespaceName()), MachineUtil.getMachineIdentifier(),
-                releaseCounter.incrementAndGet()));
+                        releaseCounter.incrementAndGet()));
 
     return KEY_JOINER.join(TIMESTAMP_FORMAT.format(new Date()), hexIdString);
   }

apollo-biz/src/test/java/com/ctrip/apollo/biz/AllTests.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/AllTests.java

-package com.ctrip.apollo.biz;
+package com.ctrip.framework.apollo.biz;
 
-import com.ctrip.apollo.biz.message.DatabaseMessageSenderTest;
-import com.ctrip.apollo.biz.repository.AppNamespaceRepositoryTest;
-import com.ctrip.apollo.biz.repository.AppRepositoryTest;
-import com.ctrip.apollo.biz.service.AdminServiceTest;
-import com.ctrip.apollo.biz.service.AdminServiceTransactionTest;
-import com.ctrip.apollo.biz.service.ConfigServiceTest;
-import com.ctrip.apollo.biz.service.PrivilegeServiceTest;
+import com.ctrip.framework.apollo.biz.message.DatabaseMessageSenderTest;
+import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepositoryTest;
+import com.ctrip.framework.apollo.biz.repository.AppRepositoryTest;
+import com.ctrip.framework.apollo.biz.service.AdminServiceTest;
+import com.ctrip.framework.apollo.biz.service.AdminServiceTransactionTest;
+import com.ctrip.framework.apollo.biz.service.ConfigServiceTest;
+import com.ctrip.framework.apollo.biz.service.PrivilegeServiceTest;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

apollo-biz/src/test/java/com/ctrip/apollo/biz/BizTestConfiguration.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/BizTestConfiguration.java

-package com.ctrip.apollo.biz;
+package com.ctrip.framework.apollo.biz;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableAutoConfiguration
-@ComponentScan(basePackages = "com.ctrip.apollo.biz")
+@ComponentScan(basePackages = "com.ctrip.framework.apollo.biz")
 public class BizTestConfiguration {
 
 }

apollo-biz/src/test/java/com/ctrip/apollo/biz/eureka/ApolloEurekaClientConfigTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/eureka/ApolloEurekaClientConfigTest.java

-package com.ctrip.apollo.biz.eureka;
+package com.ctrip.framework.apollo.biz.eureka;
 
-import com.ctrip.apollo.biz.entity.ServerConfig;
-import com.ctrip.apollo.biz.repository.ServerConfigRepository;
+import com.ctrip.framework.apollo.biz.entity.ServerConfig;
+import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-biz/src/test/java/com/ctrip/apollo/biz/message/DatabaseMessageSenderTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/message/DatabaseMessageSenderTest.java

-package com.ctrip.apollo.biz.message;
+package com.ctrip.framework.apollo.biz.message;
 
-import com.ctrip.apollo.biz.entity.ReleaseMessage;
-import com.ctrip.apollo.biz.repository.ReleaseMessageRepository;
+import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
+import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-biz/src/test/java/com/ctrip/apollo/biz/message/ReleaseMessageScannerTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScannerTest.java

-package com.ctrip.apollo.biz.message;
+package com.ctrip.framework.apollo.biz.message;
 
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.SettableFuture;
 
-import com.ctrip.apollo.biz.entity.ReleaseMessage;
-import com.ctrip.apollo.biz.repository.ReleaseMessageRepository;
+import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
+import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-biz/src/test/java/com/ctrip/apollo/biz/repository/AppNamespaceRepositoryTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/repository/AppNamespaceRepositoryTest.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
-import com.ctrip.apollo.biz.BizTestConfiguration;
-import com.ctrip.apollo.biz.entity.AppNamespace;
-import com.ctrip.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.biz.BizTestConfiguration;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.core.ConfigConsts;
 
 import org.junit.Assert;
 import org.junit.Test;

apollo-biz/src/test/java/com/ctrip/apollo/biz/repository/AppRepositoryTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/repository/AppRepositoryTest.java

-package com.ctrip.apollo.biz.repository;
+package com.ctrip.framework.apollo.biz.repository;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.BizTestConfiguration;
-import com.ctrip.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.BizTestConfiguration;
+import com.ctrip.framework.apollo.biz.entity.App;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = BizTestConfiguration.class)

apollo-biz/src/test/java/com/ctrip/apollo/biz/service/AdminServiceTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AdminServiceTest.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.Date;
 import java.util.List;
@@ -12,14 +12,14 @@ import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.BizTestConfiguration;
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.biz.entity.Audit;
-import com.ctrip.apollo.biz.entity.Cluster;
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.biz.repository.AppRepository;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.biz.BizTestConfiguration;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.entity.Cluster;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.repository.AppRepository;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = BizTestConfiguration.class)

apollo-biz/src/test/java/com/ctrip/apollo/biz/service/AdminServiceTransactionTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AdminServiceTransactionTest.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.Date;
 
@@ -16,12 +16,12 @@ import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.BizTestConfiguration;
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.biz.repository.AppNamespaceRepository;
-import com.ctrip.apollo.biz.repository.AppRepository;
-import com.ctrip.apollo.biz.repository.ClusterRepository;
-import com.ctrip.apollo.biz.repository.NamespaceRepository;
+import com.ctrip.framework.apollo.biz.BizTestConfiguration;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
+import com.ctrip.framework.apollo.biz.repository.AppRepository;
+import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
+import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = BizTestConfiguration.class)

apollo-biz/src/test/java/com/ctrip/apollo/biz/service/ClusterServiceTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ClusterServiceTest.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.Date;
 
@@ -10,9 +10,9 @@ import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.BizTestConfiguration;
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.biz.BizTestConfiguration;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = BizTestConfiguration.class)

apollo-biz/src/test/java/com/ctrip/apollo/biz/service/ConfigServiceTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ConfigServiceTest.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
-import com.ctrip.apollo.biz.entity.Release;
-import com.ctrip.apollo.biz.repository.ReleaseRepository;
+import com.ctrip.framework.apollo.biz.entity.Release;
+import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-biz/src/test/java/com/ctrip/apollo/biz/service/PrivilegeServiceTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/PrivilegeServiceTest.java

-package com.ctrip.apollo.biz.service;
+package com.ctrip.framework.apollo.biz.service;
 
 import java.util.Date;
 import java.util.List;
@@ -12,11 +12,11 @@ import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.apollo.biz.BizTestConfiguration;
-import com.ctrip.apollo.biz.entity.App;
-import com.ctrip.apollo.biz.entity.Cluster;
-import com.ctrip.apollo.biz.entity.Namespace;
-import com.ctrip.apollo.biz.entity.Privilege;
+import com.ctrip.framework.apollo.biz.BizTestConfiguration;
+import com.ctrip.framework.apollo.biz.entity.App;
+import com.ctrip.framework.apollo.biz.entity.Cluster;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.entity.Privilege;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = BizTestConfiguration.class)

apollo-biz/src/test/java/com/ctrip/apollo/biz/utils/ReleaseKeyGeneratorTest.java → apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/utils/ReleaseKeyGeneratorTest.java

-package com.ctrip.apollo.biz.utils;
+package com.ctrip.framework.apollo.biz.utils;
 
 import com.google.common.collect.Sets;
 
-import com.ctrip.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
 
 import org.junit.Test;
 import org.slf4j.Logger;

apollo-buildtools/src/main/java/com/ctrip/apollo/cat/NullClientConfigManager.java → apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullClientConfigManager.java

-package com.ctrip.apollo.cat;
+package com.ctrip.framework.apollo.cat;
 
 import java.io.File;
 import java.util.List;
@@ -54,4 +54,4 @@ public class NullClientConfigManager implements ClientConfigManager{
     return 0;
   }
 
-}
+}
\ No newline at end of file

apollo-buildtools/src/main/java/com/ctrip/apollo/cat/NullLoggerManager.java → apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullLoggerManager.java

-package com.ctrip.apollo.cat;
+package com.ctrip.framework.apollo.cat;
 
 import org.codehaus.plexus.logging.console.ConsoleLoggerManager;
 

apollo-buildtools/src/main/java/com/ctrip/apollo/cat/NullMessageManager.java → apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullMessageManager.java

-package com.ctrip.apollo.cat;
+package com.ctrip.framework.apollo.cat;
 
 import java.io.IOException;
 

apollo-buildtools/src/main/java/com/ctrip/apollo/cat/NullMessageProducer.java → apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullMessageProducer.java

-package com.ctrip.apollo.cat;
+package com.ctrip.framework.apollo.cat;
 
 import java.util.Map;
 

apollo-buildtools/src/main/java/com/ctrip/apollo/cat/NullTransportManager.java → apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullTransportManager.java

-package com.ctrip.apollo.cat;
+package com.ctrip.framework.apollo.cat;
 
 import com.dianping.cat.message.io.MessageSender;
 import com.dianping.cat.message.io.TransportManager;

apollo-client/src/main/java/com/ctrip/apollo/Config.java → apollo-client/src/main/java/com/ctrip/framework/apollo/Config.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-client/src/main/java/com/ctrip/apollo/ConfigChangeListener.java → apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigChangeListener.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
-import com.ctrip.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-client/src/main/java/com/ctrip/apollo/ConfigService.java → apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.internals.ConfigManager;
-import com.ctrip.apollo.spi.ConfigFactory;
-import com.ctrip.apollo.spi.ConfigRegistry;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.internals.ConfigManager;
+import com.ctrip.framework.apollo.spi.ConfigFactory;
+import com.ctrip.framework.apollo.spi.ConfigRegistry;
 import com.dianping.cat.Cat;
 
 import org.codehaus.plexus.PlexusContainer;

apollo-client/src/main/java/com/ctrip/apollo/build/ComponentConfigurator.java → apollo-client/src/main/java/com/ctrip/framework/apollo/build/ComponentConfigurator.java

-package com.ctrip.apollo.build;
+package com.ctrip.framework.apollo.build;
 
-import com.ctrip.apollo.internals.ConfigServiceLocator;
-import com.ctrip.apollo.internals.DefaultConfigManager;
-import com.ctrip.apollo.spi.DefaultConfigFactory;
-import com.ctrip.apollo.spi.DefaultConfigFactoryManager;
-import com.ctrip.apollo.spi.DefaultConfigRegistry;
-import com.ctrip.apollo.util.ConfigUtil;
-import com.ctrip.apollo.util.http.HttpUtil;
+import com.ctrip.framework.apollo.internals.ConfigServiceLocator;
+import com.ctrip.framework.apollo.internals.DefaultConfigManager;
+import com.ctrip.framework.apollo.spi.DefaultConfigFactory;
+import com.ctrip.framework.apollo.spi.DefaultConfigFactoryManager;
+import com.ctrip.framework.apollo.spi.DefaultConfigRegistry;
+import com.ctrip.framework.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.util.http.HttpUtil;
 
 import org.unidal.lookup.configuration.AbstractResourceConfigurator;
 import org.unidal.lookup.configuration.Component;

apollo-client/src/main/java/com/ctrip/apollo/enums/PropertyChangeType.java → apollo-client/src/main/java/com/ctrip/framework/apollo/enums/PropertyChangeType.java

-package com.ctrip.apollo.enums;
+package com.ctrip.framework.apollo.enums;
 
 
 /**

apollo-client/src/main/java/com/ctrip/apollo/internals/AbstractConfig.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
-import com.ctrip.apollo.Config;
-import com.ctrip.apollo.ConfigChangeListener;
-import com.ctrip.apollo.enums.PropertyChangeType;
-import com.ctrip.apollo.model.ConfigChange;
-import com.ctrip.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigChangeListener;
+import com.ctrip.framework.apollo.enums.PropertyChangeType;
+import com.ctrip.framework.apollo.model.ConfigChange;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
@@ -108,7 +108,7 @@ public abstract class AbstractConfig implements Config {
     for (String newKey : newKeys) {
       changes
           .add(new ConfigChange(namespace, newKey, null, current.getProperty(newKey),
-              PropertyChangeType.ADDED));
+                                PropertyChangeType.ADDED));
     }
 
     for (String removedKey : removedKeys) {

apollo-client/src/main/java/com/ctrip/apollo/internals/AbstractConfigRepository.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigRepository.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.collect.Lists;
 
-import com.ctrip.apollo.util.ExceptionUtil;
+import com.ctrip.framework.apollo.util.ExceptionUtil;
 import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;

apollo-client/src/main/java/com/ctrip/apollo/internals/ConfigManager.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigManager.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
-import com.ctrip.apollo.Config;
+import com.ctrip.framework.apollo.Config;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-client/src/main/java/com/ctrip/apollo/internals/ConfigRepository.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigRepository.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import java.util.Properties;
 

apollo-client/src/main/java/com/ctrip/apollo/internals/ConfigServiceLocator.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -7,12 +7,12 @@ import com.google.common.escape.Escaper;
 import com.google.common.net.UrlEscapers;
 import com.google.gson.reflect.TypeToken;
 
-import com.ctrip.apollo.core.dto.ServiceDTO;
-import com.ctrip.apollo.core.utils.ApolloThreadFactory;
-import com.ctrip.apollo.util.ConfigUtil;
-import com.ctrip.apollo.util.http.HttpRequest;
-import com.ctrip.apollo.util.http.HttpResponse;
-import com.ctrip.apollo.util.http.HttpUtil;
+import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
+import com.ctrip.framework.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.util.http.HttpRequest;
+import com.ctrip.framework.apollo.util.http.HttpResponse;
+import com.ctrip.framework.apollo.util.http.HttpUtil;
 import com.dianping.cat.Cat;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;

apollo-client/src/main/java/com/ctrip/apollo/internals/DefaultConfig.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.collect.ImmutableMap;
 
-import com.ctrip.apollo.core.utils.ClassLoaderUtil;
-import com.ctrip.apollo.enums.PropertyChangeType;
-import com.ctrip.apollo.model.ConfigChange;
-import com.ctrip.apollo.model.ConfigChangeEvent;
-import com.ctrip.apollo.util.ExceptionUtil;
+import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
+import com.ctrip.framework.apollo.enums.PropertyChangeType;
+import com.ctrip.framework.apollo.model.ConfigChange;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.util.ExceptionUtil;
 import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
@@ -20,6 +20,7 @@ import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
 
+
 /**
  * @author Jason Song(song_s@ctrip.com)
  */

apollo-client/src/main/java/com/ctrip/apollo/internals/DefaultConfigManager.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.collect.Maps;
 
-import com.ctrip.apollo.Config;
-import com.ctrip.apollo.spi.ConfigFactory;
-import com.ctrip.apollo.spi.ConfigFactoryManager;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.spi.ConfigFactory;
+import com.ctrip.framework.apollo.spi.ConfigFactoryManager;
 
 import org.unidal.lookup.annotation.Inject;
 import org.unidal.lookup.annotation.Named;

apollo-client/src/main/java/com/ctrip/apollo/internals/LocalFileConfigRepository.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepository.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.util.ConfigUtil;
-import com.ctrip.apollo.util.ExceptionUtil;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.util.ExceptionUtil;
 import com.dianping.cat.Cat;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;

apollo-client/src/main/java/com/ctrip/apollo/internals/RemoteConfigRepository.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
@@ -7,18 +7,18 @@ import com.google.common.collect.Maps;
 import com.google.common.escape.Escaper;
 import com.google.common.net.UrlEscapers;
 
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ApolloConfig;
-import com.ctrip.apollo.core.dto.ApolloConfigNotification;
-import com.ctrip.apollo.core.dto.ServiceDTO;
-import com.ctrip.apollo.core.schedule.ExponentialSchedulePolicy;
-import com.ctrip.apollo.core.schedule.SchedulePolicy;
-import com.ctrip.apollo.core.utils.ApolloThreadFactory;
-import com.ctrip.apollo.util.ConfigUtil;
-import com.ctrip.apollo.util.ExceptionUtil;
-import com.ctrip.apollo.util.http.HttpRequest;
-import com.ctrip.apollo.util.http.HttpResponse;
-import com.ctrip.apollo.util.http.HttpUtil;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ApolloConfig;
+import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
+import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.ctrip.framework.apollo.core.schedule.ExponentialSchedulePolicy;
+import com.ctrip.framework.apollo.core.schedule.SchedulePolicy;
+import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
+import com.ctrip.framework.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.util.ExceptionUtil;
+import com.ctrip.framework.apollo.util.http.HttpRequest;
+import com.ctrip.framework.apollo.util.http.HttpResponse;
+import com.ctrip.framework.apollo.util.http.HttpUtil;
 import com.dianping.cat.Cat;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;

apollo-client/src/main/java/com/ctrip/apollo/internals/RepositoryChangeListener.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RepositoryChangeListener.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import java.util.Properties;
 

apollo-client/src/main/java/com/ctrip/apollo/internals/SimpleConfig.java → apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 
-import com.ctrip.apollo.model.ConfigChange;
-import com.ctrip.apollo.model.ConfigChangeEvent;
-import com.ctrip.apollo.util.ExceptionUtil;
+import com.ctrip.framework.apollo.model.ConfigChange;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.util.ExceptionUtil;
 import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;

apollo-client/src/main/java/com/ctrip/apollo/model/ConfigChange.java → apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChange.java

-package com.ctrip.apollo.model;
+package com.ctrip.framework.apollo.model;
 
 
 import com.google.common.base.MoreObjects;
 
-import com.ctrip.apollo.enums.PropertyChangeType;
+import com.ctrip.framework.apollo.enums.PropertyChangeType;
 
 /**
  * Holds the information for a config change.

apollo-client/src/main/java/com/ctrip/apollo/model/ConfigChangeEvent.java → apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChangeEvent.java

-package com.ctrip.apollo.model;
+package com.ctrip.framework.apollo.model;
 
 import java.util.Map;
 import java.util.Set;

apollo-client/src/main/java/com/ctrip/apollo/spi/ConfigFactory.java → apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactory.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
-import com.ctrip.apollo.Config;
+import com.ctrip.framework.apollo.Config;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-client/src/main/java/com/ctrip/apollo/spi/ConfigFactoryManager.java → apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactoryManager.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-client/src/main/java/com/ctrip/apollo/spi/ConfigRegistry.java → apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigRegistry.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
 /**
  * The manually config registry, use with caution!

apollo-client/src/main/java/com/ctrip/apollo/spi/DefaultConfigFactory.java → apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactory.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
-import com.ctrip.apollo.Config;
-import com.ctrip.apollo.core.utils.ClassLoaderUtil;
-import com.ctrip.apollo.internals.DefaultConfig;
-import com.ctrip.apollo.internals.LocalFileConfigRepository;
-import com.ctrip.apollo.internals.RemoteConfigRepository;
-import com.ctrip.apollo.util.ExceptionUtil;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
+import com.ctrip.framework.apollo.internals.DefaultConfig;
+import com.ctrip.framework.apollo.internals.LocalFileConfigRepository;
+import com.ctrip.framework.apollo.internals.RemoteConfigRepository;
+import com.ctrip.framework.apollo.util.ExceptionUtil;
 import com.dianping.cat.Cat;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;

apollo-client/src/main/java/com/ctrip/apollo/spi/DefaultConfigFactoryManager.java → apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactoryManager.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
 import com.google.common.collect.Maps;
 

apollo-client/src/main/java/com/ctrip/apollo/spi/DefaultConfigRegistry.java → apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistry.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
 import com.google.common.collect.Maps;
 

apollo-client/src/main/java/com/ctrip/apollo/util/ConfigUtil.java → apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java

-package com.ctrip.apollo.util;
+package com.ctrip.framework.apollo.util;
 
 import com.google.common.base.Preconditions;
 
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.MetaDomainConsts;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.enums.EnvUtils;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.MetaDomainConsts;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.enums.EnvUtils;
 import com.ctrip.framework.foundation.Foundation;
 
 import org.unidal.lookup.annotation.Named;

apollo-client/src/main/java/com/ctrip/apollo/util/ExceptionUtil.java → apollo-client/src/main/java/com/ctrip/framework/apollo/util/ExceptionUtil.java

-package com.ctrip.apollo.util;
+package com.ctrip.framework.apollo.util;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;

apollo-client/src/main/java/com/ctrip/apollo/util/http/HttpRequest.java → apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpRequest.java

-package com.ctrip.apollo.util.http;
+package com.ctrip.framework.apollo.util.http;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-client/src/main/java/com/ctrip/apollo/util/http/HttpResponse.java → apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpResponse.java

-package com.ctrip.apollo.util.http;
+package com.ctrip.framework.apollo.util.http;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-client/src/main/java/com/ctrip/apollo/util/http/HttpUtil.java → apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpUtil.java

-package com.ctrip.apollo.util.http;
+package com.ctrip.framework.apollo.util.http;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.io.BaseEncoding;
 import com.google.gson.Gson;
 
-import com.ctrip.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.util.ConfigUtil;
 
 import org.unidal.helper.Files;
 import org.unidal.lookup.annotation.Inject;

apollo-client/src/main/resources/META-INF/plexus/components.xml

 <plexus>
 	<components>
 		<component>
-			<role>com.ctrip.apollo.internals.ConfigManager</role>
-			<implementation>com.ctrip.apollo.internals.DefaultConfigManager</implementation>
+			<role>com.ctrip.framework.apollo.internals.ConfigManager</role>
+			<implementation>com.ctrip.framework.apollo.internals.DefaultConfigManager</implementation>
 			<requirements>
 				<requirement>
-					<role>com.ctrip.apollo.spi.ConfigFactoryManager</role>
+					<role>com.ctrip.framework.apollo.spi.ConfigFactoryManager</role>
 				</requirement>
 			</requirements>
 		</component>
 		<component>
-			<role>com.ctrip.apollo.spi.ConfigFactory</role>
-			<implementation>com.ctrip.apollo.spi.DefaultConfigFactory</implementation>
+			<role>com.ctrip.framework.apollo.spi.ConfigFactory</role>
+			<implementation>com.ctrip.framework.apollo.spi.DefaultConfigFactory</implementation>
 		</component>
 		<component>
-			<role>com.ctrip.apollo.spi.ConfigRegistry</role>
-			<implementation>com.ctrip.apollo.spi.DefaultConfigRegistry</implementation>
+			<role>com.ctrip.framework.apollo.spi.ConfigRegistry</role>
+			<implementation>com.ctrip.framework.apollo.spi.DefaultConfigRegistry</implementation>
 		</component>
 		<component>
-			<role>com.ctrip.apollo.spi.ConfigFactoryManager</role>
-			<implementation>com.ctrip.apollo.spi.DefaultConfigFactoryManager</implementation>
+			<role>com.ctrip.framework.apollo.spi.ConfigFactoryManager</role>
+			<implementation>com.ctrip.framework.apollo.spi.DefaultConfigFactoryManager</implementation>
 			<requirements>
 				<requirement>
-					<role>com.ctrip.apollo.spi.ConfigRegistry</role>
+					<role>com.ctrip.framework.apollo.spi.ConfigRegistry</role>
 				</requirement>
 			</requirements>
 		</component>
 		<component>
-			<role>com.ctrip.apollo.util.ConfigUtil</role>
-			<implementation>com.ctrip.apollo.util.ConfigUtil</implementation>
+			<role>com.ctrip.framework.apollo.util.ConfigUtil</role>
+			<implementation>com.ctrip.framework.apollo.util.ConfigUtil</implementation>
 		</component>
 		<component>
-			<role>com.ctrip.apollo.internals.ConfigServiceLocator</role>
-			<implementation>com.ctrip.apollo.internals.ConfigServiceLocator</implementation>
+			<role>com.ctrip.framework.apollo.internals.ConfigServiceLocator</role>
+			<implementation>com.ctrip.framework.apollo.internals.ConfigServiceLocator</implementation>
 			<requirements>
 				<requirement>
-					<role>com.ctrip.apollo.util.http.HttpUtil</role>
+					<role>com.ctrip.framework.apollo.util.http.HttpUtil</role>
 				</requirement>
 				<requirement>
-					<role>com.ctrip.apollo.util.ConfigUtil</role>
+					<role>com.ctrip.framework.apollo.util.ConfigUtil</role>
 				</requirement>
 			</requirements>
 		</component>
 		<component>
-			<role>com.ctrip.apollo.util.http.HttpUtil</role>
-			<implementation>com.ctrip.apollo.util.http.HttpUtil</implementation>
+			<role>com.ctrip.framework.apollo.util.http.HttpUtil</role>
+			<implementation>com.ctrip.framework.apollo.util.http.HttpUtil</implementation>
 			<requirements>
 				<requirement>
-					<role>com.ctrip.apollo.util.ConfigUtil</role>
+					<role>com.ctrip.framework.apollo.util.ConfigUtil</role>
 				</requirement>
 			</requirements>
 		</component>

apollo-client/src/test/java/com/ctrip/apollo/AllTests.java → apollo-client/src/test/java/com/ctrip/framework/apollo/AllTests.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
 
-import com.ctrip.apollo.integration.ConfigIntegrationTest;
-import com.ctrip.apollo.internals.DefaultConfigManagerTest;
-import com.ctrip.apollo.internals.DefaultConfigTest;
-import com.ctrip.apollo.internals.LocalFileConfigRepositoryTest;
-import com.ctrip.apollo.internals.RemoteConfigRepositoryTest;
-import com.ctrip.apollo.internals.SimpleConfigTest;
-import com.ctrip.apollo.spi.DefaultConfigFactoryManagerTest;
-import com.ctrip.apollo.spi.DefaultConfigFactoryTest;
-import com.ctrip.apollo.spi.DefaultConfigRegistryTest;
-import com.ctrip.apollo.util.ExceptionUtilTest;
+import com.ctrip.framework.apollo.integration.ConfigIntegrationTest;
+import com.ctrip.framework.apollo.internals.DefaultConfigManagerTest;
+import com.ctrip.framework.apollo.internals.DefaultConfigTest;
+import com.ctrip.framework.apollo.internals.LocalFileConfigRepositoryTest;
+import com.ctrip.framework.apollo.internals.RemoteConfigRepositoryTest;
+import com.ctrip.framework.apollo.internals.SimpleConfigTest;
+import com.ctrip.framework.apollo.spi.DefaultConfigFactoryManagerTest;
+import com.ctrip.framework.apollo.spi.DefaultConfigFactoryTest;
+import com.ctrip.framework.apollo.spi.DefaultConfigRegistryTest;
+import com.ctrip.framework.apollo.util.ExceptionUtilTest;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

apollo-client/src/test/java/com/ctrip/apollo/BaseIntegrationTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/BaseIntegrationTest.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 
-import com.ctrip.apollo.ConfigService;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.dto.ServiceDTO;
-import com.ctrip.apollo.core.utils.ClassLoaderUtil;
-import com.ctrip.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
+import com.ctrip.framework.apollo.util.ConfigUtil;
 
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;

apollo-client/src/test/java/com/ctrip/apollo/ConfigServiceTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/ConfigServiceTest.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.internals.AbstractConfig;
-import com.ctrip.apollo.spi.ConfigFactory;
-import com.ctrip.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.internals.AbstractConfig;
+import com.ctrip.framework.apollo.spi.ConfigFactory;
+import com.ctrip.framework.apollo.util.ConfigUtil;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-client/src/test/java/com/ctrip/apollo/integration/ConfigIntegrationTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/integration/ConfigIntegrationTest.java

-package com.ctrip.apollo.integration;
+package com.ctrip.framework.apollo.integration;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
@@ -6,15 +6,15 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.SettableFuture;
 
-import com.ctrip.apollo.BaseIntegrationTest;
-import com.ctrip.apollo.Config;
-import com.ctrip.apollo.ConfigChangeListener;
-import com.ctrip.apollo.ConfigService;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ApolloConfig;
-import com.ctrip.apollo.core.dto.ApolloConfigNotification;
-import com.ctrip.apollo.core.utils.ClassLoaderUtil;
-import com.ctrip.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.BaseIntegrationTest;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigChangeListener;
+import com.ctrip.framework.apollo.ConfigService;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ApolloConfig;
+import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
+import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;

apollo-client/src/test/java/com/ctrip/apollo/internals/DefaultConfigManagerTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigManagerTest.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
-import com.ctrip.apollo.Config;
-import com.ctrip.apollo.spi.ConfigFactory;
-import com.ctrip.apollo.spi.ConfigFactoryManager;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.spi.ConfigFactory;
+import com.ctrip.framework.apollo.spi.ConfigFactoryManager;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-client/src/test/java/com/ctrip/apollo/internals/DefaultConfigTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigTest.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 
-import com.ctrip.apollo.ConfigChangeListener;
-import com.ctrip.apollo.core.utils.ClassLoaderUtil;
-import com.ctrip.apollo.enums.PropertyChangeType;
-import com.ctrip.apollo.model.ConfigChange;
-import com.ctrip.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.ConfigChangeListener;
+import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
+import com.ctrip.framework.apollo.enums.PropertyChangeType;
+import com.ctrip.framework.apollo.model.ConfigChange;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 
 import org.junit.After;
 import org.junit.Before;

apollo-client/src/test/java/com/ctrip/apollo/internals/LocalFileConfigRepositoryTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Joiner;
 import com.google.common.io.Files;
 
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.util.ConfigUtil;
 
 import org.junit.After;
 import org.junit.Before;

apollo-client/src/test/java/com/ctrip/apollo/internals/RemoteConfigRepositoryTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.SettableFuture;
-import com.ctrip.apollo.core.dto.ApolloConfig;
-import com.ctrip.apollo.core.dto.ApolloConfigNotification;
-import com.ctrip.apollo.core.dto.ServiceDTO;
-import com.ctrip.apollo.util.ConfigUtil;
-import com.ctrip.apollo.util.http.HttpRequest;
-import com.ctrip.apollo.util.http.HttpResponse;
-import com.ctrip.apollo.util.http.HttpUtil;
+import com.ctrip.framework.apollo.core.dto.ApolloConfig;
+import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
+import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.ctrip.framework.apollo.util.ConfigUtil;
+import com.ctrip.framework.apollo.util.http.HttpRequest;
+import com.ctrip.framework.apollo.util.http.HttpResponse;
+import com.ctrip.framework.apollo.util.http.HttpUtil;
 
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.junit.Before;

apollo-client/src/test/java/com/ctrip/apollo/internals/SimpleConfigTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/internals/SimpleConfigTest.java

-package com.ctrip.apollo.internals;
+package com.ctrip.framework.apollo.internals;
 
 import com.google.common.collect.ImmutableMap;
 
-import com.ctrip.apollo.Config;
-import com.ctrip.apollo.ConfigChangeListener;
-import com.ctrip.apollo.enums.PropertyChangeType;
-import com.ctrip.apollo.model.ConfigChange;
-import com.ctrip.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigChangeListener;
+import com.ctrip.framework.apollo.enums.PropertyChangeType;
+import com.ctrip.framework.apollo.model.ConfigChange;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-client/src/test/java/com/ctrip/apollo/spi/DefaultConfigFactoryManagerTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigFactoryManagerTest.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
-import com.ctrip.apollo.Config;
+import com.ctrip.framework.apollo.Config;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-client/src/test/java/com/ctrip/apollo/spi/DefaultConfigFactoryTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigFactoryTest.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
-import com.ctrip.apollo.Config;
-import com.ctrip.apollo.internals.DefaultConfig;
-import com.ctrip.apollo.internals.LocalFileConfigRepository;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.internals.DefaultConfig;
+import com.ctrip.framework.apollo.internals.LocalFileConfigRepository;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-client/src/test/java/com/ctrip/apollo/spi/DefaultConfigRegistryTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistryTest.java

-package com.ctrip.apollo.spi;
+package com.ctrip.framework.apollo.spi;
 
-import com.ctrip.apollo.Config;
+import com.ctrip.framework.apollo.Config;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-client/src/test/java/com/ctrip/apollo/util/ExceptionUtilTest.java → apollo-client/src/test/java/com/ctrip/framework/apollo/util/ExceptionUtilTest.java

-package com.ctrip.apollo.util;
+package com.ctrip.framework.apollo.util;
 
 import org.junit.Test;
 

apollo-client/src/test/resources/META-INF/plexus/plexus.xml

@@ -2,17 +2,17 @@
 	<components>
 		<component>
 			<role>com.dianping.cat.configuration.ClientConfigManager</role>
-			<implementation>com.ctrip.apollo.cat.NullClientConfigManager
+			<implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
 			</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.io.TransportManager</role>
-			<implementation>com.ctrip.apollo.cat.NullTransportManager
+			<implementation>com.ctrip.framework.apollo.cat.NullTransportManager
 			</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageManager</role>
-			<implementation>com.ctrip.apollo.cat.NullMessageManager
+			<implementation>com.ctrip.framework.apollo.cat.NullMessageManager
 			</implementation>
 			<requirements>
 				<requirement>
@@ -22,7 +22,7 @@
 		</component>
 		<component>
 			<role>com.dianping.cat.message.MessageProducer</role>
-			<implementation>com.ctrip.apollo.cat.NullMessageProducer
+			<implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
 			</implementation>
 			<requirements>
 				<requirement>
@@ -35,8 +35,8 @@
 		</component>
 		<component>
 			<role>org.codehaus.plexus.logging.LoggerManager</role>
-			<implementation>com.ctrip.apollo.cat.NullLoggerManager
+			<implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
 			</implementation>
 		</component>
 	</components>
-</plexus>
+</plexus>
\ No newline at end of file

apollo-client/src/test/resources/log4j2.xml

@@ -9,7 +9,7 @@
         </Async>
     </appenders>
     <loggers>
-        <logger name="com.ctrip.apollo" additivity="false" level="trace">
+        <logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
             <AppenderRef ref="Async" level="DEBUG"/>
         </logger>
         <root level="INFO">

apollo-common/src/main/java/com/ctrip/apollo/common/ApolloCommonConfig.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/ApolloCommonConfig.java

-package com.ctrip.apollo.common;
+package com.ctrip.framework.apollo.common;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 
 @EnableAutoConfiguration
 @Configuration
-@ComponentScan(basePackageClasses = com.ctrip.apollo.common.ApolloCommonConfig.class)
+@ComponentScan(basePackageClasses = ApolloCommonConfig.class)
 public class ApolloCommonConfig {
 
 }

apollo-common/src/main/java/com/ctrip/apollo/common/auth/ActiveUser.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/auth/ActiveUser.java

-package com.ctrip.apollo.common.auth;
+package com.ctrip.framework.apollo.common.auth;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

apollo-common/src/main/java/com/ctrip/apollo/common/auth/RestTemplateFactory.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/auth/RestTemplateFactory.java

-package com.ctrip.apollo.common.auth;
+package com.ctrip.framework.apollo.common.auth;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;

apollo-common/src/main/java/com/ctrip/apollo/common/controller/ApolloInfoController.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/ApolloInfoController.java

-package com.ctrip.apollo.common.controller;
+package com.ctrip.framework.apollo.common.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.apollo.Apollo;
+import com.ctrip.framework.apollo.Apollo;
 import com.ctrip.framework.foundation.Foundation;
 
 @RestController

apollo-common/src/main/java/com/ctrip/apollo/common/controller/CatConfig.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/CatConfig.java

-package com.ctrip.apollo.common.controller;
+package com.ctrip.framework.apollo.common.controller;
 
 import javax.servlet.DispatcherType;
 

apollo-common/src/main/java/com/ctrip/apollo/common/controller/CharacterEncodingFilterConfiguration.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/CharacterEncodingFilterConfiguration.java

-package com.ctrip.apollo.common.controller;
+package com.ctrip.framework.apollo.common.controller;
 
 import javax.servlet.DispatcherType;
 

apollo-common/src/main/java/com/ctrip/apollo/common/controller/GlobalDefaultExceptionHandler.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/GlobalDefaultExceptionHandler.java

-package com.ctrip.apollo.common.controller;
+package com.ctrip.framework.apollo.common.controller;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.client.HttpStatusCodeException;
 
-import com.ctrip.apollo.core.exception.AbstractBaseException;
-import com.ctrip.apollo.core.exception.BadRequestException;
-import com.ctrip.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.core.exception.AbstractBaseException;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
 import com.dianping.cat.Cat;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;

apollo-common/src/main/java/com/ctrip/apollo/common/controller/HttpMessageConverterConfiguration.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java

-package com.ctrip.apollo.common.controller;
+package com.ctrip.framework.apollo.common.controller;
 
 import com.google.common.collect.Lists;
 import com.google.gson.GsonBuilder;

apollo-common/src/main/java/com/ctrip/apollo/common/controller/WebMvcConfig.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/WebMvcConfig.java

-package com.ctrip.apollo.common.controller;
+package com.ctrip.framework.apollo.common.controller;
 
 import java.util.List;
 

apollo-common/src/main/java/com/ctrip/apollo/common/controller/WebSecurityConfig.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/WebSecurityConfig.java

-package com.ctrip.apollo.common.controller;
+package com.ctrip.framework.apollo.common.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

apollo-common/src/main/java/com/ctrip/apollo/common/http/MultiResponseEntity.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/http/MultiResponseEntity.java

-package com.ctrip.apollo.common.http;
+package com.ctrip.framework.apollo.common.http;
 
 import org.springframework.http.HttpStatus;
 

apollo-common/src/main/java/com/ctrip/apollo/common/http/RichResponseEntity.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/http/RichResponseEntity.java

-package com.ctrip.apollo.common.http;
+package com.ctrip.framework.apollo.common.http;
 
 import org.springframework.http.HttpStatus;
 

apollo-common/src/main/java/com/ctrip/apollo/common/utils/BeanUtils.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/BeanUtils.java

-package com.ctrip.apollo.common.utils;
+package com.ctrip.framework.apollo.common.utils;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;

apollo-common/src/main/java/com/ctrip/apollo/common/utils/ExceptionUtils.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/ExceptionUtils.java

-package com.ctrip.apollo.common.utils;
+package com.ctrip.framework.apollo.common.utils;
 
 import java.lang.reflect.Type;
 import java.util.Map;

apollo-configservice/src/main/java/com/ctrip/apollo/configservice/ConfigServiceApplication.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java

-package com.ctrip.apollo.configservice;
+package com.ctrip.framework.apollo.configservice;
+
+import com.ctrip.framework.apollo.biz.ApolloBizConfig;
+import com.ctrip.framework.apollo.common.ApolloCommonConfig;
+import com.ctrip.framework.apollo.metaservice.ApolloMetaServiceConfig;
 
 import org.springframework.boot.actuate.system.ApplicationPidFileWriter;
 import org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter;
@@ -24,10 +28,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @Configuration
 @EnableTransactionManagement
 @PropertySource(value = {"classpath:configservice.properties"})
-@ComponentScan(basePackageClasses = {com.ctrip.apollo.common.ApolloCommonConfig.class,
-    com.ctrip.apollo.biz.ApolloBizConfig.class,
-    com.ctrip.apollo.configservice.ConfigServiceApplication.class,
-    com.ctrip.apollo.metaservice.ApolloMetaServiceConfig.class})
+@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
+    ApolloBizConfig.class,
+    ConfigServiceApplication.class,
+    ApolloMetaServiceConfig.class})
 public class ConfigServiceApplication {
 
   public static void main(String[] args) throws Exception {

apollo-configservice/src/main/java/com/ctrip/apollo/configservice/ConfigServiceAutoConfiguration.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceAutoConfiguration.java

-package com.ctrip.apollo.configservice;
+package com.ctrip.framework.apollo.configservice;
 
-import com.ctrip.apollo.biz.message.ReleaseMessageScanner;
-import com.ctrip.apollo.configservice.controller.NotificationController;
+import com.ctrip.framework.apollo.biz.message.ReleaseMessageScanner;
+import com.ctrip.framework.apollo.configservice.controller.NotificationController;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

apollo-configservice/src/main/java/com/ctrip/apollo/configservice/ConfigServiceHealthIndicator.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceHealthIndicator.java

-package com.ctrip.apollo.configservice;
+package com.ctrip.framework.apollo.configservice;
 
-import com.ctrip.apollo.biz.service.AppService;
+import com.ctrip.framework.apollo.biz.service.AppService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.health.Health;

apollo-configservice/src/main/java/com/ctrip/apollo/configservice/ServletInitializer.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ServletInitializer.java

-package com.ctrip.apollo.configservice;
+package com.ctrip.framework.apollo.configservice;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.web.SpringBootServletInitializer;

apollo-configservice/src/main/java/com/ctrip/apollo/configservice/controller/ConfigController.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java

-package com.ctrip.apollo.configservice.controller;
+package com.ctrip.framework.apollo.configservice.controller;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
@@ -8,12 +8,12 @@ import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import com.ctrip.apollo.biz.entity.AppNamespace;
-import com.ctrip.apollo.biz.entity.Release;
-import com.ctrip.apollo.biz.service.AppNamespaceService;
-import com.ctrip.apollo.biz.service.ConfigService;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ApolloConfig;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.biz.entity.Release;
+import com.ctrip.framework.apollo.biz.service.AppNamespaceService;
+import com.ctrip.framework.apollo.biz.service.ConfigService;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ApolloConfig;
 import com.dianping.cat.Cat;
 
 import org.springframework.beans.factory.annotation.Autowired;

apollo-configservice/src/main/java/com/ctrip/apollo/configservice/controller/NotificationController.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationController.java

-package com.ctrip.apollo.configservice.controller;
+package com.ctrip.framework.apollo.configservice.controller;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
@@ -8,13 +8,13 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 
-import com.ctrip.apollo.biz.entity.AppNamespace;
-import com.ctrip.apollo.biz.message.MessageListener;
-import com.ctrip.apollo.biz.message.Topics;
-import com.ctrip.apollo.biz.service.AppNamespaceService;
-import com.ctrip.apollo.biz.utils.EntityManagerUtil;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ApolloConfigNotification;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.biz.message.MessageListener;
+import com.ctrip.framework.apollo.biz.message.Topics;
+import com.ctrip.framework.apollo.biz.service.AppNamespaceService;
+import com.ctrip.framework.apollo.biz.utils.EntityManagerUtil;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
 import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;

apollo-configservice/src/main/java/com/ctrip/apollo/metaservice/ApolloMetaServiceConfig.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/ApolloMetaServiceConfig.java

-package com.ctrip.apollo.metaservice;
+package com.ctrip.framework.apollo.metaservice;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 
 @EnableAutoConfiguration
 @Configuration
-@ComponentScan(basePackageClasses = com.ctrip.apollo.metaservice.ApolloMetaServiceConfig.class)
+@ComponentScan(basePackageClasses = ApolloMetaServiceConfig.class)
 public class ApolloMetaServiceConfig {
 
 }

apollo-configservice/src/main/java/com/ctrip/apollo/metaservice/controller/ServiceController.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java

-package com.ctrip.apollo.metaservice.controller;
+package com.ctrip.framework.apollo.metaservice.controller;
 
-import com.ctrip.apollo.core.dto.ServiceDTO;
-import com.ctrip.apollo.metaservice.service.DiscoveryService;
+import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.ctrip.framework.apollo.metaservice.service.DiscoveryService;
 import com.netflix.appinfo.InstanceInfo;
 
 import org.springframework.beans.factory.annotation.Autowired;

apollo-configservice/src/main/java/com/ctrip/apollo/metaservice/service/DiscoveryService.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DiscoveryService.java

-package com.ctrip.apollo.metaservice.service;
+package com.ctrip.framework.apollo.metaservice.service;
 
-import com.ctrip.apollo.core.ServiceNameConsts;
+import com.ctrip.framework.apollo.core.ServiceNameConsts;
 import com.dianping.cat.Cat;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;

apollo-configservice/src/test/java/com/ctrip/apollo/ConfigServiceTestConfiguration.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/ConfigServiceTestConfiguration.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
-import com.ctrip.apollo.common.controller.WebSecurityConfig;
-import com.ctrip.apollo.configservice.ConfigServiceApplication;
+import com.ctrip.framework.apollo.common.controller.WebSecurityConfig;
+import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;

apollo-configservice/src/test/java/com/ctrip/apollo/LocalConfigServiceApplication.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/LocalConfigServiceApplication.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;

apollo-configservice/src/test/java/com/ctrip/apollo/configservice/AllTests.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/AllTests.java

-package com.ctrip.apollo.configservice;
+package com.ctrip.framework.apollo.configservice;
 
-import com.ctrip.apollo.configservice.controller.ConfigControllerTest;
-import com.ctrip.apollo.configservice.controller.NotificationControllerTest;
-import com.ctrip.apollo.configservice.integration.ConfigControllerIntegrationTest;
-import com.ctrip.apollo.configservice.integration.NotificationControllerIntegrationTest;
+import com.ctrip.framework.apollo.configservice.controller.ConfigControllerTest;
+import com.ctrip.framework.apollo.configservice.controller.NotificationControllerTest;
+import com.ctrip.framework.apollo.configservice.integration.ConfigControllerIntegrationTest;
+import com.ctrip.framework.apollo.configservice.integration.NotificationControllerIntegrationTest;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/ConfigControllerTest.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/ConfigControllerTest.java

-package com.ctrip.apollo.configservice.controller;
+package com.ctrip.framework.apollo.configservice.controller;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
@@ -6,12 +6,12 @@ import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 
-import com.ctrip.apollo.biz.entity.AppNamespace;
-import com.ctrip.apollo.biz.entity.Release;
-import com.ctrip.apollo.biz.service.AppNamespaceService;
-import com.ctrip.apollo.biz.service.ConfigService;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ApolloConfig;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.biz.entity.Release;
+import com.ctrip.framework.apollo.biz.service.AppNamespaceService;
+import com.ctrip.framework.apollo.biz.service.ConfigService;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ApolloConfig;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -82,8 +82,8 @@ public class ConfigControllerTest {
     when(someRelease.getReleaseKey()).thenReturn(someServerSideNewReleaseKey);
 
     ApolloConfig result = configController.queryConfig(someAppId, someClusterName,
-        defaultNamespaceName, someDataCenter, someClientSideReleaseKey,
-        someResponse);
+                                                       defaultNamespaceName, someDataCenter, someClientSideReleaseKey,
+                                                       someResponse);
 
     verify(configService, times(1)).findRelease(someAppId, someClusterName, defaultNamespaceName);
     assertEquals(someAppId, result.getAppId());

apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/NotificationControllerTest.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerTest.java

-package com.ctrip.apollo.configservice.controller;
+package com.ctrip.framework.apollo.configservice.controller;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 
-import com.ctrip.apollo.biz.entity.AppNamespace;
-import com.ctrip.apollo.biz.message.Topics;
-import com.ctrip.apollo.biz.service.AppNamespaceService;
-import com.ctrip.apollo.biz.utils.EntityManagerUtil;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ApolloConfigNotification;
+import com.ctrip.framework.apollo.biz.entity.AppNamespace;
+import com.ctrip.framework.apollo.biz.message.Topics;
+import com.ctrip.framework.apollo.biz.service.AppNamespaceService;
+import com.ctrip.framework.apollo.biz.utils.EntityManagerUtil;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/TestWebSecurityConfig.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/TestWebSecurityConfig.java

-package com.ctrip.apollo.configservice.controller;
+package com.ctrip.framework.apollo.configservice.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

apollo-configservice/src/test/java/com/ctrip/apollo/configservice/integration/AbstractBaseIntegrationTest.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/AbstractBaseIntegrationTest.java

-package com.ctrip.apollo.configservice.integration;
+package com.ctrip.framework.apollo.configservice.integration;
 
-import com.ctrip.apollo.ConfigServiceTestConfiguration;
+import com.ctrip.framework.apollo.ConfigServiceTestConfiguration;
 
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;

apollo-configservice/src/test/java/com/ctrip/apollo/configservice/integration/ConfigControllerIntegrationTest.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/ConfigControllerIntegrationTest.java

-package com.ctrip.apollo.configservice.integration;
+package com.ctrip.framework.apollo.configservice.integration;
 
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ApolloConfig;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ApolloConfig;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-configservice/src/test/java/com/ctrip/apollo/configservice/integration/NotificationControllerIntegrationTest.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/NotificationControllerIntegrationTest.java

-package com.ctrip.apollo.configservice.integration;
+package com.ctrip.framework.apollo.configservice.integration;
 
 import com.google.common.base.Joiner;
 
-import com.ctrip.apollo.biz.entity.ReleaseMessage;
-import com.ctrip.apollo.biz.repository.ReleaseMessageRepository;
-import com.ctrip.apollo.configservice.controller.NotificationController;
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ApolloConfigNotification;
+import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
+import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
+import com.ctrip.framework.apollo.configservice.controller.NotificationController;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-configservice/src/test/resources/META-INF/plexus/plexus.xml

@@ -2,17 +2,17 @@
 	<components>
 		<component>
 			<role>com.dianping.cat.configuration.ClientConfigManager</role>
-			<implementation>com.ctrip.apollo.cat.NullClientConfigManager
+			<implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
 			</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.io.TransportManager</role>
-			<implementation>com.ctrip.apollo.cat.NullTransportManager
+			<implementation>com.ctrip.framework.apollo.cat.NullTransportManager
 			</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageManager</role>
-			<implementation>com.ctrip.apollo.cat.NullMessageManager
+			<implementation>com.ctrip.framework.apollo.cat.NullMessageManager
 			</implementation>
 			<requirements>
 				<requirement>
@@ -22,7 +22,7 @@
 		</component>
 		<component>
 			<role>com.dianping.cat.message.MessageProducer</role>
-			<implementation>com.ctrip.apollo.cat.NullMessageProducer
+			<implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
 			</implementation>
 			<requirements>
 				<requirement>
@@ -35,8 +35,8 @@
 		</component>
 		<component>
 			<role>org.codehaus.plexus.logging.LoggerManager</role>
-			<implementation>com.ctrip.apollo.cat.NullLoggerManager
+			<implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
 			</implementation>
 		</component>
 	</components>
-</plexus>
+</plexus>
\ No newline at end of file

apollo-core/src/main/java/com/ctrip/apollo/Apollo.java → apollo-core/src/main/java/com/ctrip/framework/apollo/Apollo.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-core/src/main/java/com/ctrip/apollo/core/ConfigConsts.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/ConfigConsts.java

-package com.ctrip.apollo.core;
+package com.ctrip.framework.apollo.core;
 
 public interface ConfigConsts {
   String NAMESPACE_DEFAULT = "application";

apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/MetaDomainConsts.java

-package com.ctrip.apollo.core;
+package com.ctrip.framework.apollo.core;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.utils.ResourceUtils;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.utils.ResourceUtils;
 
 /**
  * The meta domain will load the meta server from System environment first, if not exist, will load

apollo-core/src/main/java/com/ctrip/apollo/core/ServiceNameConsts.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/ServiceNameConsts.java

-package com.ctrip.apollo.core;
+package com.ctrip.framework.apollo.core;
 
 public interface ServiceNameConsts {
 

apollo-core/src/main/java/com/ctrip/apollo/core/dto/ApolloConfig.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ApolloConfig.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 import com.google.common.base.MoreObjects;
 

apollo-core/src/main/java/com/ctrip/apollo/core/dto/ApolloConfigNotification.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ApolloConfigNotification.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-core/src/main/java/com/ctrip/apollo/core/dto/AppDTO.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/AppDTO.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 public class AppDTO {
 

apollo-core/src/main/java/com/ctrip/apollo/core/dto/AppNamespaceDTO.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/AppNamespaceDTO.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 public class AppNamespaceDTO {
   private long id;

apollo-core/src/main/java/com/ctrip/apollo/core/dto/ClusterDTO.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ClusterDTO.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 public class ClusterDTO {
 

apollo-core/src/main/java/com/ctrip/apollo/core/dto/ItemChangeSets.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ItemChangeSets.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 import java.util.LinkedList;
 import java.util.List;

apollo-core/src/main/java/com/ctrip/apollo/core/dto/ItemDTO.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ItemDTO.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 import java.util.Date;
 

apollo-core/src/main/java/com/ctrip/apollo/core/dto/NamespaceDTO.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/NamespaceDTO.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 public class NamespaceDTO{
   private long id;

apollo-core/src/main/java/com/ctrip/apollo/core/dto/ReleaseDTO.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ReleaseDTO.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 public class ReleaseDTO{
   private long id;

apollo-core/src/main/java/com/ctrip/apollo/core/dto/ServiceDTO.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ServiceDTO.java

-package com.ctrip.apollo.core.dto;
+package com.ctrip.framework.apollo.core.dto;
 
 import com.google.common.base.MoreObjects;
 

apollo-core/src/main/java/com/ctrip/apollo/core/enums/Env.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java

-package com.ctrip.apollo.core.enums;
+package com.ctrip.framework.apollo.core.enums;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-core/src/main/java/com/ctrip/apollo/core/enums/EnvUtils.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/EnvUtils.java

-package com.ctrip.apollo.core.enums;
+package com.ctrip.framework.apollo.core.enums;
 
-import com.ctrip.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 public final class EnvUtils {
   

apollo-core/src/main/java/com/ctrip/apollo/core/exception/AbstractBaseException.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/exception/AbstractBaseException.java

-package com.ctrip.apollo.core.exception;
+package com.ctrip.framework.apollo.core.exception;
 
 public abstract class AbstractBaseException extends RuntimeException{
 

apollo-core/src/main/java/com/ctrip/apollo/core/exception/BadRequestException.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/exception/BadRequestException.java

-package com.ctrip.apollo.core.exception;
+package com.ctrip.framework.apollo.core.exception;
 
 public class BadRequestException extends AbstractBaseException {
 

apollo-core/src/main/java/com/ctrip/apollo/core/exception/NotFoundException.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/exception/NotFoundException.java

-package com.ctrip.apollo.core.exception;
+package com.ctrip.framework.apollo.core.exception;
 
 public class NotFoundException extends AbstractBaseException {
   /**

apollo-core/src/main/java/com/ctrip/apollo/core/exception/ServiceException.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/exception/ServiceException.java

-package com.ctrip.apollo.core.exception;
+package com.ctrip.framework.apollo.core.exception;
 
 public class ServiceException extends AbstractBaseException {
 

apollo-core/src/main/java/com/ctrip/apollo/core/schedule/ExponentialSchedulePolicy.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/schedule/ExponentialSchedulePolicy.java

-package com.ctrip.apollo.core.schedule;
+package com.ctrip.framework.apollo.core.schedule;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-core/src/main/java/com/ctrip/apollo/core/schedule/SchedulePolicy.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/schedule/SchedulePolicy.java

-package com.ctrip.apollo.core.schedule;
+package com.ctrip.framework.apollo.core.schedule;
 
 /**
  * Schedule policy

apollo-core/src/main/java/com/ctrip/apollo/core/utils/ApolloThreadFactory.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ApolloThreadFactory.java

-package com.ctrip.apollo.core.utils;
+package com.ctrip.framework.apollo.core.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apollo-core/src/main/java/com/ctrip/apollo/core/utils/ByteUtil.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ByteUtil.java

-package com.ctrip.apollo.core.utils;
+package com.ctrip.framework.apollo.core.utils;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-core/src/main/java/com/ctrip/apollo/core/utils/ClassLoaderUtil.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ClassLoaderUtil.java

-package com.ctrip.apollo.core.utils;
+package com.ctrip.framework.apollo.core.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apollo-core/src/main/java/com/ctrip/apollo/core/utils/DNSUtil.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/DNSUtil.java

-package com.ctrip.apollo.core.utils;
+package com.ctrip.framework.apollo.core.utils;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

apollo-core/src/main/java/com/ctrip/apollo/core/utils/MachineUtil.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/MachineUtil.java

-package com.ctrip.apollo.core.utils;
+package com.ctrip.framework.apollo.core.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apollo-core/src/main/java/com/ctrip/apollo/core/utils/ResourceUtils.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ResourceUtils.java

-package com.ctrip.apollo.core.utils;
+package com.ctrip.framework.apollo.core.utils;
 
 import java.io.File;
 import java.io.FileInputStream;

apollo-core/src/main/java/com/ctrip/apollo/core/utils/StringUtils.java → apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/StringUtils.java

-package com.ctrip.apollo.core.utils;
+package com.ctrip.framework.apollo.core.utils;
 
 import java.util.Collection;
 import java.util.Iterator;

apollo-core/src/test/java/com/ctrip/apollo/core/AllTests.java → apollo-core/src/test/java/com/ctrip/framework/apollo/core/AllTests.java

-package com.ctrip.apollo.core;
+package com.ctrip.framework.apollo.core;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

apollo-core/src/test/java/com/ctrip/apollo/core/MetaDomainTest.java → apollo-core/src/test/java/com/ctrip/framework/apollo/core/MetaDomainTest.java

-package com.ctrip.apollo.core;
+package com.ctrip.framework.apollo.core;
 
-import com.ctrip.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.enums.Env;
 
 import org.junit.Assert;
 import org.junit.Test;

apollo-demo/src/main/java/ApolloConfigDemo.java

 
 import com.google.common.base.Strings;
 
-import com.ctrip.apollo.Config;
-import com.ctrip.apollo.ConfigChangeListener;
-import com.ctrip.apollo.ConfigService;
-import com.ctrip.apollo.model.ConfigChange;
-import com.ctrip.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigChangeListener;
+import com.ctrip.framework.apollo.ConfigService;
+import com.ctrip.framework.apollo.model.ConfigChange;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apollo-demo/src/main/resources/log4j2.xml

@@ -9,7 +9,7 @@
         </Async>
     </appenders>
     <loggers>
-        <logger name="com.ctrip.apollo" additivity="false" level="trace">
+        <logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
             <AppenderRef ref="Async" level="DEBUG"/>
         </logger>
         <root level="INFO">

apollo-portal/src/main/java/com/ctrip/apollo/portal/PortalApplication.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalApplication.java

-package com.ctrip.apollo.portal;
+package com.ctrip.framework.apollo.portal;
+
+import com.ctrip.framework.apollo.common.ApolloCommonConfig;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.system.ApplicationPidFileWriter;
@@ -12,8 +14,8 @@ import org.springframework.context.annotation.PropertySource;
 @EnableAutoConfiguration
 @Configuration
 @PropertySource(value = {"classpath:portal.properties"})
-@ComponentScan(basePackageClasses = {com.ctrip.apollo.common.ApolloCommonConfig.class,
-    com.ctrip.apollo.portal.PortalApplication.class})
+@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
+    PortalApplication.class})
 public class PortalApplication {
 
   public static void main(String[] args) throws Exception {

apollo-portal/src/main/java/com/ctrip/apollo/portal/PortalSettings.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalSettings.java

-package com.ctrip.apollo.portal;
+package com.ctrip.framework.apollo.portal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,8 +20,8 @@ import org.springframework.boot.actuate.health.Health;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
 
 @Component
 public class PortalSettings {

apollo-portal/src/main/java/com/ctrip/apollo/portal/api/API.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/API.java

-package com.ctrip.apollo.portal.api;
+package com.ctrip.framework.apollo.portal.api;
 
 import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.client.RestTemplate;
 
-import com.ctrip.apollo.common.auth.RestTemplateFactory;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.portal.service.ServiceLocator;
+import com.ctrip.framework.apollo.common.auth.RestTemplateFactory;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.portal.service.ServiceLocator;
 
 public class API {
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/api/AdminServiceAPI.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java

-package com.ctrip.apollo.portal.api;
+package com.ctrip.framework.apollo.portal.api;
 
 
-import com.ctrip.apollo.core.dto.AppNamespaceDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.dto.ClusterDTO;
-import com.ctrip.apollo.core.dto.ItemChangeSets;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
-import com.ctrip.apollo.core.dto.ReleaseDTO;
+import com.ctrip.framework.apollo.core.dto.AppNamespaceDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.core.dto.ClusterDTO;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
 
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.http.HttpEntity;
@@ -131,7 +131,7 @@ public class AdminServiceAPI {
   public static class ReleaseAPI extends API {
 
     public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName,
-        String namespace) {
+                                        String namespace) {
       ReleaseDTO releaseDTO = restTemplate.getForObject(
           getAdminServiceHost(env) + String.format(
               "apps/%s/clusters/%s/namespaces/%s/releases/latest", appId, clusterName, namespace),

apollo-portal/src/main/java/com/ctrip/apollo/portal/constants/PortalConstants.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/constants/PortalConstants.java

-package com.ctrip.apollo.portal.constants;
+package com.ctrip.framework.apollo.portal.constants;
 
 public interface PortalConstants {
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/PortalAppController.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PortalAppController.java

-package com.ctrip.apollo.portal.controller;
+package com.ctrip.framework.apollo.portal.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -10,15 +10,15 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.ctrip.apollo.common.http.MultiResponseEntity;
-import com.ctrip.apollo.common.http.RichResponseEntity;
-import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.exception.BadRequestException;
-import com.ctrip.apollo.core.utils.StringUtils;
-import com.ctrip.apollo.portal.PortalSettings;
-import com.ctrip.apollo.portal.entity.EnvClusterInfo;
-import com.ctrip.apollo.portal.service.PortalAppService;
+import com.ctrip.framework.apollo.common.http.MultiResponseEntity;
+import com.ctrip.framework.apollo.common.http.RichResponseEntity;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.portal.PortalSettings;
+import com.ctrip.framework.apollo.portal.entity.EnvClusterInfo;
+import com.ctrip.framework.apollo.portal.service.PortalAppService;
 
 import java.util.List;
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/PortalConfigController.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PortalConfigController.java

-package com.ctrip.apollo.portal.controller;
+package com.ctrip.framework.apollo.portal.controller;
 
 
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.dto.ReleaseDTO;
-import com.ctrip.apollo.core.exception.BadRequestException;
-import com.ctrip.apollo.core.utils.StringUtils;
-import com.ctrip.apollo.portal.entity.ItemDiffs;
-import com.ctrip.apollo.portal.entity.form.NamespaceSyncModel;
-import com.ctrip.apollo.portal.entity.form.NamespaceTextModel;
-import com.ctrip.apollo.portal.entity.form.NamespaceReleaseModel;
-import com.ctrip.apollo.portal.service.PortalConfigService;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.portal.entity.ItemDiffs;
+import com.ctrip.framework.apollo.portal.entity.form.NamespaceSyncModel;
+import com.ctrip.framework.apollo.portal.entity.form.NamespaceTextModel;
+import com.ctrip.framework.apollo.portal.entity.form.NamespaceReleaseModel;
+import com.ctrip.framework.apollo.portal.service.PortalConfigService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -54,8 +54,8 @@ public class PortalConfigController {
   @RequestMapping(value = "/apps/{appId}/env/{env}/clusters/{clusterName}/namespaces/{namespaceName}/release", method = RequestMethod.POST, consumes = {
       "application/json"})
   public ReleaseDTO createRelease(@PathVariable String appId,
-      @PathVariable String env, @PathVariable String clusterName,
-      @PathVariable String namespaceName, @RequestBody NamespaceReleaseModel model) {
+                                  @PathVariable String env, @PathVariable String clusterName,
+                                  @PathVariable String namespaceName, @RequestBody NamespaceReleaseModel model) {
     if (model == null) {
       throw new BadRequestException("request payload shoud not be null");
     }

apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/PortalEnvController.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PortalEnvController.java

-package com.ctrip.apollo.portal.controller;
+package com.ctrip.framework.apollo.portal.controller;
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.portal.PortalSettings;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.portal.PortalSettings;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/PortalNamespaceController.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PortalNamespaceController.java

-package com.ctrip.apollo.portal.controller;
-
-import com.ctrip.apollo.core.dto.AppNamespaceDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.exception.BadRequestException;
-import com.ctrip.apollo.core.utils.StringUtils;
-import com.ctrip.apollo.portal.entity.NamespaceVO;
-import com.ctrip.apollo.portal.service.PortalNamespaceService;
+package com.ctrip.framework.apollo.portal.controller;
+
+import com.ctrip.framework.apollo.core.dto.AppNamespaceDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.portal.entity.NamespaceVO;
+import com.ctrip.framework.apollo.portal.service.PortalNamespaceService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;

apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/EnvClusterInfo.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/EnvClusterInfo.java

-package com.ctrip.apollo.portal.entity;
+package com.ctrip.framework.apollo.portal.entity;
 
-import com.ctrip.apollo.core.dto.ClusterDTO;
-import com.ctrip.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.dto.ClusterDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
 
 import java.util.List;
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/ItemDiffs.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/ItemDiffs.java

-package com.ctrip.apollo.portal.entity;
+package com.ctrip.framework.apollo.portal.entity;
 
-import com.ctrip.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
 
 public class ItemDiffs {
   private NamespaceIdentifer namespace;

apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/NamespaceIdentifer.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/NamespaceIdentifer.java

-package com.ctrip.apollo.portal.entity;
+package com.ctrip.framework.apollo.portal.entity;
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.utils.StringUtils;
-import com.ctrip.apollo.portal.entity.form.Verifiable;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.portal.entity.form.Verifiable;
 
-public class NamespaceIdentifer implements Verifiable{
+public class NamespaceIdentifer implements Verifiable {
   private String appId;
   private String env;
   private String clusterName;

apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/NamespaceVO.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/NamespaceVO.java

-package com.ctrip.apollo.portal.entity;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
+package com.ctrip.framework.apollo.portal.entity;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 
 import java.util.List;
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/form/NamespaceReleaseModel.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/form/NamespaceReleaseModel.java

-package com.ctrip.apollo.portal.entity.form;
+package com.ctrip.framework.apollo.portal.entity.form;
 
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 public class NamespaceReleaseModel implements Verifiable {
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/form/NamespaceSyncModel.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/form/NamespaceSyncModel.java

-package com.ctrip.apollo.portal.entity.form;
+package com.ctrip.framework.apollo.portal.entity.form;
 
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.portal.entity.NamespaceIdentifer;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.portal.entity.NamespaceIdentifer;
 
 import org.springframework.util.CollectionUtils;
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/form/NamespaceTextModel.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/form/NamespaceTextModel.java

-package com.ctrip.apollo.portal.entity.form;
+package com.ctrip.framework.apollo.portal.entity.form;
 
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 public class NamespaceTextModel implements Verifiable {
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/form/Verifiable.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/form/Verifiable.java

-package com.ctrip.apollo.portal.entity.form;
+package com.ctrip.framework.apollo.portal.entity.form;
 
 public interface Verifiable {
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/PortalAppService.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalAppService.java

-package com.ctrip.apollo.portal.service;
+package com.ctrip.framework.apollo.portal.service;
 
 import java.util.List;
 
@@ -10,14 +10,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpStatusCodeException;
 
-import com.ctrip.apollo.common.utils.ExceptionUtils;
-import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.exception.BadRequestException;
-import com.ctrip.apollo.core.exception.ServiceException;
-import com.ctrip.apollo.portal.PortalSettings;
-import com.ctrip.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.apollo.portal.entity.EnvClusterInfo;
+import com.ctrip.framework.apollo.common.utils.ExceptionUtils;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.portal.PortalSettings;
+import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.portal.entity.EnvClusterInfo;
 
 @Service
 public class PortalAppService {

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/PortalClusterService.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalClusterService.java

-package com.ctrip.apollo.portal.service;
+package com.ctrip.framework.apollo.portal.service;
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.dto.ClusterDTO;
-import com.ctrip.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.dto.ClusterDTO;
+import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/PortalConfigService.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java

-package com.ctrip.apollo.portal.service;
+package com.ctrip.framework.apollo.portal.service;
 
 
 import org.slf4j.Logger;
@@ -8,21 +8,21 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.ctrip.apollo.common.utils.BeanUtils;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.dto.ItemChangeSets;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
-import com.ctrip.apollo.core.dto.ReleaseDTO;
-import com.ctrip.apollo.core.exception.BadRequestException;
-import com.ctrip.apollo.core.exception.NotFoundException;
-import com.ctrip.apollo.core.exception.ServiceException;
-import com.ctrip.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.apollo.portal.entity.ItemDiffs;
-import com.ctrip.apollo.portal.entity.NamespaceIdentifer;
-import com.ctrip.apollo.portal.entity.form.NamespaceTextModel;
-import com.ctrip.apollo.portal.entity.form.NamespaceReleaseModel;
-import com.ctrip.apollo.portal.service.txtresolver.ConfigTextResolver;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
+import com.ctrip.framework.apollo.core.exception.NotFoundException;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.portal.entity.ItemDiffs;
+import com.ctrip.framework.apollo.portal.entity.NamespaceIdentifer;
+import com.ctrip.framework.apollo.portal.entity.form.NamespaceTextModel;
+import com.ctrip.framework.apollo.portal.entity.form.NamespaceReleaseModel;
+import com.ctrip.framework.apollo.portal.service.txtresolver.ConfigTextResolver;
 
 import java.util.LinkedList;
 import java.util.List;

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/PortalNamespaceService.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalNamespaceService.java

-package com.ctrip.apollo.portal.service;
+package com.ctrip.framework.apollo.portal.service;
 
 import com.google.gson.Gson;
 
-import com.ctrip.apollo.common.utils.ExceptionUtils;
-import com.ctrip.apollo.core.dto.AppNamespaceDTO;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
-import com.ctrip.apollo.core.dto.ReleaseDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.utils.StringUtils;
-import com.ctrip.apollo.portal.PortalSettings;
-import com.ctrip.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.apollo.portal.entity.NamespaceVO;
+import com.ctrip.framework.apollo.common.utils.ExceptionUtils;
+import com.ctrip.framework.apollo.core.dto.AppNamespaceDTO;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.portal.PortalSettings;
+import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.portal.entity.NamespaceVO;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/ServiceLocator.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ServiceLocator.java

-package com.ctrip.apollo.portal.service;
+package com.ctrip.framework.apollo.portal.service;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -18,10 +18,10 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import com.ctrip.apollo.core.MetaDomainConsts;
-import com.ctrip.apollo.core.dto.ServiceDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.core.MetaDomainConsts;
+import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
 
 /**
  * @author liuym

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/txtresolver/ConfigTextResolver.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/txtresolver/ConfigTextResolver.java

-package com.ctrip.apollo.portal.service.txtresolver;
+package com.ctrip.framework.apollo.portal.service.txtresolver;
 
-import com.ctrip.apollo.core.dto.ItemChangeSets;
-import com.ctrip.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
 
 import java.util.List;
 

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/txtresolver/PropertyResolver.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/txtresolver/PropertyResolver.java

-package com.ctrip.apollo.portal.service.txtresolver;
+package com.ctrip.framework.apollo.portal.service.txtresolver;
 
-import com.ctrip.apollo.core.dto.ItemChangeSets;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.exception.BadRequestException;
-import com.ctrip.apollo.core.utils.StringUtils;
-import com.ctrip.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
 
 import org.springframework.stereotype.Component;
 

apollo-portal/src/test/java/com/ctrip/apollo/LocalPortalApplication.java → apollo-portal/src/test/java/com/ctrip/framework/apollo/LocalPortalApplication.java

-package com.ctrip.apollo;
+package com.ctrip.framework.apollo;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;

apollo-portal/src/test/java/com/ctrip/apollo/portal/AbstractPortalTest.java → apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/AbstractPortalTest.java

-package com.ctrip.apollo.portal;
-
-import com.ctrip.apollo.portal.PortalApplication;
+package com.ctrip.framework.apollo.portal;
 
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;

apollo-portal/src/test/java/com/ctrip/apollo/portal/AllTests.java → apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/AllTests.java

-package com.ctrip.apollo.portal;
+package com.ctrip.framework.apollo.portal;
 
 
 import org.junit.runner.RunWith;

apollo-portal/src/test/java/com/ctrip/apollo/portal/ConfigServiceTest.java → apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/ConfigServiceTest.java

-package com.ctrip.apollo.portal;
-
-import com.ctrip.apollo.core.ConfigConsts;
-import com.ctrip.apollo.core.dto.ItemChangeSets;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.apollo.portal.entity.ItemDiffs;
-import com.ctrip.apollo.portal.entity.NamespaceIdentifer;
-import com.ctrip.apollo.portal.entity.form.NamespaceTextModel;
-import com.ctrip.apollo.portal.service.PortalConfigService;
-import com.ctrip.apollo.portal.service.txtresolver.PropertyResolver;
+package com.ctrip.framework.apollo.portal;
+
+import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.portal.entity.ItemDiffs;
+import com.ctrip.framework.apollo.portal.entity.NamespaceIdentifer;
+import com.ctrip.framework.apollo.portal.entity.form.NamespaceTextModel;
+import com.ctrip.framework.apollo.portal.service.PortalConfigService;
+import com.ctrip.framework.apollo.portal.service.txtresolver.PropertyResolver;
 
 import org.junit.Assert;
 import org.junit.Before;

apollo-portal/src/test/java/com/ctrip/apollo/portal/NamespaceServiceTest.java → apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/NamespaceServiceTest.java

-package com.ctrip.apollo.portal;
-
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.dto.NamespaceDTO;
-import com.ctrip.apollo.core.dto.ReleaseDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.apollo.portal.entity.NamespaceVO;
-import com.ctrip.apollo.portal.service.PortalNamespaceService;
-import com.ctrip.apollo.portal.service.txtresolver.PropertyResolver;
+package com.ctrip.framework.apollo.portal;
+
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.portal.entity.NamespaceVO;
+import com.ctrip.framework.apollo.portal.service.PortalNamespaceService;
+import com.ctrip.framework.apollo.portal.service.txtresolver.PropertyResolver;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-portal/src/test/java/com/ctrip/apollo/portal/PropertyResolverTest.java → apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/PropertyResolverTest.java

-package com.ctrip.apollo.portal;
+package com.ctrip.framework.apollo.portal;
 
 
-import com.ctrip.apollo.core.dto.ItemChangeSets;
-import com.ctrip.apollo.core.dto.ItemDTO;
-import com.ctrip.apollo.core.exception.BadRequestException;
-import com.ctrip.apollo.portal.service.txtresolver.ConfigTextResolver;
+import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.core.dto.ItemDTO;
+import com.ctrip.framework.apollo.core.exception.BadRequestException;
+import com.ctrip.framework.apollo.portal.service.txtresolver.ConfigTextResolver;
 
 import org.junit.Assert;
 import org.junit.Test;

apollo-portal/src/test/java/com/ctrip/apollo/portal/ServiceExceptionTest.java → apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/ServiceExceptionTest.java

-package com.ctrip.apollo.portal;
+package com.ctrip.framework.apollo.portal;
 
 
 import static org.mockito.Matchers.any;
@@ -21,12 +21,13 @@ import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.HttpStatusCodeException;
 
-import com.ctrip.apollo.common.utils.ExceptionUtils;
-import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.exception.ServiceException;
-import com.ctrip.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.apollo.portal.service.PortalAppService;
+import com.ctrip.framework.apollo.common.utils.ExceptionUtils;
+import com.ctrip.framework.apollo.core.dto.AppDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
+import com.ctrip.framework.apollo.core.exception.ServiceException;
+import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.portal.service.PortalAppService;
+
 import com.google.gson.Gson;
 
 public class ServiceExceptionTest extends AbstractPortalTest {

apollo-portal/src/test/resources/META-INF/plexus/plexus.xml

@@ -2,17 +2,17 @@
 	<components>
 		<component>
 			<role>com.dianping.cat.configuration.ClientConfigManager</role>
-			<implementation>com.ctrip.apollo.cat.NullClientConfigManager
+			<implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
 			</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.io.TransportManager</role>
-			<implementation>com.ctrip.apollo.cat.NullTransportManager
+			<implementation>com.ctrip.framework.apollo.cat.NullTransportManager
 			</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageManager</role>
-			<implementation>com.ctrip.apollo.cat.NullMessageManager
+			<implementation>com.ctrip.framework.apollo.cat.NullMessageManager
 			</implementation>
 			<requirements>
 				<requirement>
@@ -22,7 +22,7 @@
 		</component>
 		<component>
 			<role>com.dianping.cat.message.MessageProducer</role>
-			<implementation>com.ctrip.apollo.cat.NullMessageProducer
+			<implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
 			</implementation>
 			<requirements>
 				<requirement>
@@ -35,8 +35,8 @@
 		</component>
 		<component>
 			<role>org.codehaus.plexus.logging.LoggerManager</role>
-			<implementation>com.ctrip.apollo.cat.NullLoggerManager
+			<implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
 			</implementation>
 		</component>
 	</components>
-</plexus>
+</plexus>
\ No newline at end of file

application.pid

-13303
\ No newline at end of file