Commit 007a3ed7 authored by lepdou's avatar lepdou

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

parent 58d59c1f
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.ApplicationPidFileWriter;
import org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter; import org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter;
...@@ -18,9 +21,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -18,9 +21,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@PropertySource(value = {"classpath:adminservice.properties"}) @PropertySource(value = {"classpath:adminservice.properties"})
@EnableAutoConfiguration @EnableAutoConfiguration
@EnableTransactionManagement @EnableTransactionManagement
@ComponentScan(basePackageClasses = {com.ctrip.apollo.common.ApolloCommonConfig.class, @ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
com.ctrip.apollo.biz.ApolloBizConfig.class, ApolloBizConfig.class,
com.ctrip.apollo.adminservice.AdminServiceApplication.class}) AdminServiceApplication.class})
public class AdminServiceApplication { public class AdminServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
ConfigurableApplicationContext context = ConfigurableApplicationContext context =
......
package com.ctrip.apollo.adminservice; package com.ctrip.framework.apollo.adminservice;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Health;
...@@ -6,7 +6,7 @@ import org.springframework.boot.actuate.health.HealthIndicator; ...@@ -6,7 +6,7 @@ import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ctrip.apollo.biz.service.AppService; import com.ctrip.framework.apollo.biz.service.AppService;
@Component @Component
public class AdminServiceHealthIndicator implements HealthIndicator { public class AdminServiceHealthIndicator implements HealthIndicator {
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import java.util.List; import java.util.List;
...@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.biz.service.AdminService; import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.apollo.biz.service.AppService; import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.apollo.common.auth.ActiveUser; import com.ctrip.framework.apollo.common.auth.ActiveUser;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.dto.AppDTO; import com.ctrip.framework.apollo.core.dto.AppDTO;
import com.ctrip.apollo.core.exception.NotFoundException; import com.ctrip.framework.apollo.core.exception.NotFoundException;
import com.ctrip.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.core.utils.StringUtils;
@RestController @RestController
public class AppController { public class AppController {
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
...@@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ctrip.apollo.biz.entity.AppNamespace; import com.ctrip.framework.apollo.biz.entity.AppNamespace;
import com.ctrip.apollo.biz.service.AppNamespaceService; import com.ctrip.framework.apollo.biz.service.AppNamespaceService;
import com.ctrip.apollo.common.auth.ActiveUser; import com.ctrip.framework.apollo.common.auth.ActiveUser;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.dto.AppNamespaceDTO; import com.ctrip.framework.apollo.core.dto.AppNamespaceDTO;
import java.util.List; import java.util.List;
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import java.util.List; import java.util.List;
...@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ctrip.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.apollo.biz.service.ClusterService; import com.ctrip.framework.apollo.biz.service.ClusterService;
import com.ctrip.apollo.common.auth.ActiveUser; import com.ctrip.framework.apollo.common.auth.ActiveUser;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.dto.ClusterDTO; import com.ctrip.framework.apollo.core.dto.ClusterDTO;
import com.ctrip.apollo.core.exception.NotFoundException; import com.ctrip.framework.apollo.core.exception.NotFoundException;
@RestController @RestController
public class ClusterController { public class ClusterController {
......
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
...@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ctrip.apollo.biz.entity.Item; import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.apollo.biz.service.ItemService; import com.ctrip.framework.apollo.biz.service.ItemService;
import com.ctrip.apollo.common.auth.ActiveUser; import com.ctrip.framework.apollo.common.auth.ActiveUser;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.dto.ItemDTO; import com.ctrip.framework.apollo.core.dto.ItemDTO;
import com.ctrip.apollo.core.exception.NotFoundException; import com.ctrip.framework.apollo.core.exception.NotFoundException;
@RestController @RestController
public class ItemController { public class ItemController {
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
...@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ctrip.apollo.biz.service.ItemSetService; import com.ctrip.framework.apollo.biz.service.ItemSetService;
import com.ctrip.apollo.common.auth.ActiveUser; import com.ctrip.framework.apollo.common.auth.ActiveUser;
import com.ctrip.apollo.core.dto.ItemChangeSets; import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
@RestController @RestController
public class ItemSetController { public class ItemSetController {
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import java.util.List; import java.util.List;
...@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.biz.service.NamespaceService; import com.ctrip.framework.apollo.biz.service.NamespaceService;
import com.ctrip.apollo.common.auth.ActiveUser; import com.ctrip.framework.apollo.common.auth.ActiveUser;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.dto.NamespaceDTO; import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
import com.ctrip.apollo.core.exception.NotFoundException; import com.ctrip.framework.apollo.core.exception.NotFoundException;
@RestController @RestController
public class NamespaceController { public class NamespaceController {
......
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.biz.entity.Release; import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.apollo.biz.message.MessageSender; import com.ctrip.framework.apollo.biz.message.MessageSender;
import com.ctrip.apollo.biz.message.Topics; import com.ctrip.framework.apollo.biz.message.Topics;
import com.ctrip.apollo.biz.service.ConfigService; import com.ctrip.framework.apollo.biz.service.ConfigService;
import com.ctrip.apollo.biz.service.NamespaceService; import com.ctrip.framework.apollo.biz.service.NamespaceService;
import com.ctrip.apollo.biz.service.ReleaseService; import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.apollo.common.auth.ActiveUser; import com.ctrip.framework.apollo.common.auth.ActiveUser;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.apollo.core.dto.ReleaseDTO; import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
import com.ctrip.apollo.core.exception.NotFoundException; import com.ctrip.framework.apollo.core.exception.NotFoundException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
......
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.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
...@@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan.Filter; ...@@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.FilterType;
import com.ctrip.apollo.adminservice.AdminServiceApplication; import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
@Configuration @Configuration
@ComponentScan(excludeFilters = {@Filter(type = FilterType.ASSIGNABLE_TYPE, value = { @ComponentScan(excludeFilters = {@Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
......
package com.ctrip.apollo; package com.ctrip.framework.apollo;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
......
package com.ctrip.apollo.adminservice; package com.ctrip.framework.apollo.adminservice;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Suite; import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses; import org.junit.runners.Suite.SuiteClasses;
import com.ctrip.apollo.adminservice.controller.AppControllerTest; import com.ctrip.framework.apollo.adminservice.controller.AppControllerTest;
import com.ctrip.apollo.adminservice.controller.ControllerExceptionTest; import com.ctrip.framework.apollo.adminservice.controller.ControllerExceptionTest;
import com.ctrip.apollo.adminservice.controller.ControllerIntegrationExceptionTest; import com.ctrip.framework.apollo.adminservice.controller.ControllerIntegrationExceptionTest;
import com.ctrip.apollo.adminservice.controller.ItemSetControllerTest; import com.ctrip.framework.apollo.adminservice.controller.ItemSetControllerTest;
import com.ctrip.apollo.adminservice.controller.ReleaseControllerTest; import com.ctrip.framework.apollo.adminservice.controller.ReleaseControllerTest;
@RunWith(Suite.class) @RunWith(Suite.class)
@SuiteClasses({AppControllerTest.class, ReleaseControllerTest.class, ItemSetControllerTest.class, @SuiteClasses({AppControllerTest.class, ReleaseControllerTest.class, ItemSetControllerTest.class,
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
...@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; ...@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import com.ctrip.apollo.AdminServiceTestConfiguration; import com.ctrip.framework.apollo.AdminServiceTestConfiguration;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = AdminServiceTestConfiguration.class) @SpringApplicationConfiguration(classes = AdminServiceTestConfiguration.class)
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
...@@ -9,10 +9,10 @@ import org.springframework.test.context.jdbc.Sql; ...@@ -9,10 +9,10 @@ import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase; import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpClientErrorException;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.biz.repository.AppRepository; import com.ctrip.framework.apollo.biz.repository.AppRepository;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.dto.AppDTO; import com.ctrip.framework.apollo.core.dto.AppDTO;
public class AppControllerTest extends AbstractControllerTest { public class AppControllerTest extends AbstractControllerTest {
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.apollo.biz.entity.AppNamespace; import com.ctrip.framework.apollo.biz.entity.AppNamespace;
import com.ctrip.apollo.biz.repository.AppNamespaceRepository; import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
import com.ctrip.apollo.core.dto.AppNamespaceDTO; import com.ctrip.framework.apollo.core.dto.AppNamespaceDTO;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
...@@ -19,12 +19,12 @@ import org.springframework.security.core.userdetails.User; ...@@ -19,12 +19,12 @@ import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.biz.service.AdminService; import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.apollo.biz.service.AppService; import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.apollo.core.dto.AppDTO; import com.ctrip.framework.apollo.core.dto.AppDTO;
import com.ctrip.apollo.core.exception.NotFoundException; import com.ctrip.framework.apollo.core.exception.NotFoundException;
import com.ctrip.apollo.core.exception.ServiceException; import com.ctrip.framework.apollo.core.exception.ServiceException;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class ControllerExceptionTest { public class ControllerExceptionTest {
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
...@@ -16,10 +16,11 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase; ...@@ -16,10 +16,11 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.HttpStatusCodeException;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.biz.service.AdminService; import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.apollo.biz.service.AppService; import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.apollo.core.dto.AppDTO; import com.ctrip.framework.apollo.core.dto.AppDTO;
import com.google.gson.Gson; import com.google.gson.Gson;
public class ControllerIntegrationExceptionTest extends AbstractControllerTest { public class ControllerIntegrationExceptionTest extends AbstractControllerTest {
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import java.util.List; import java.util.List;
...@@ -12,13 +12,13 @@ import org.springframework.test.context.jdbc.Sql; ...@@ -12,13 +12,13 @@ import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase; import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import com.ctrip.apollo.biz.entity.Item; import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.apollo.biz.repository.ItemRepository; import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.apollo.core.dto.AppDTO; import com.ctrip.framework.apollo.core.dto.AppDTO;
import com.ctrip.apollo.core.dto.ClusterDTO; import com.ctrip.framework.apollo.core.dto.ClusterDTO;
import com.ctrip.apollo.core.dto.ItemChangeSets; import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
import com.ctrip.apollo.core.dto.ItemDTO; import com.ctrip.framework.apollo.core.dto.ItemDTO;
import com.ctrip.apollo.core.dto.NamespaceDTO; import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
public class ItemSetControllerTest extends AbstractControllerTest { public class ItemSetControllerTest extends AbstractControllerTest {
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.biz.message.MessageSender; import com.ctrip.framework.apollo.biz.message.MessageSender;
import com.ctrip.apollo.biz.message.Topics; import com.ctrip.framework.apollo.biz.message.Topics;
import com.ctrip.apollo.biz.repository.ReleaseRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
import com.ctrip.apollo.biz.service.NamespaceService; import com.ctrip.framework.apollo.biz.service.NamespaceService;
import com.ctrip.apollo.biz.service.ReleaseService; import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.apollo.core.dto.AppDTO; import com.ctrip.framework.apollo.core.dto.AppDTO;
import com.ctrip.apollo.core.dto.ClusterDTO; import com.ctrip.framework.apollo.core.dto.ClusterDTO;
import com.ctrip.apollo.core.dto.ItemDTO; import com.ctrip.framework.apollo.core.dto.ItemDTO;
import com.ctrip.apollo.core.dto.NamespaceDTO; import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
import com.ctrip.apollo.core.dto.ReleaseDTO; import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
......
package com.ctrip.apollo.adminservice.controller; package com.ctrip.framework.apollo.adminservice.controller;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
......
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
<components> <components>
<component> <component>
<role>com.dianping.cat.configuration.ClientConfigManager</role> <role>com.dianping.cat.configuration.ClientConfigManager</role>
<implementation>com.ctrip.apollo.cat.NullClientConfigManager <implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
</implementation> </implementation>
</component> </component>
<component> <component>
<role>com.dianping.cat.message.io.TransportManager</role> <role>com.dianping.cat.message.io.TransportManager</role>
<implementation>com.ctrip.apollo.cat.NullTransportManager <implementation>com.ctrip.framework.apollo.cat.NullTransportManager
</implementation> </implementation>
</component> </component>
<component> <component>
<role>com.dianping.cat.message.spi.MessageManager</role> <role>com.dianping.cat.message.spi.MessageManager</role>
<implementation>com.ctrip.apollo.cat.NullMessageManager <implementation>com.ctrip.framework.apollo.cat.NullMessageManager
</implementation> </implementation>
<requirements> <requirements>
<requirement> <requirement>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</component> </component>
<component> <component>
<role>com.dianping.cat.message.MessageProducer</role> <role>com.dianping.cat.message.MessageProducer</role>
<implementation>com.ctrip.apollo.cat.NullMessageProducer <implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
</implementation> </implementation>
<requirements> <requirements>
<requirement> <requirement>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</component> </component>
<component> <component>
<role>org.codehaus.plexus.logging.LoggerManager</role> <role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>com.ctrip.apollo.cat.NullLoggerManager <implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
</implementation> </implementation>
</component> </component>
</components> </components>
......
package com.ctrip.apollo.assembly; package com.ctrip.framework.apollo.assembly;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -10,9 +10,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder; ...@@ -10,9 +10,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.context.scope.refresh.RefreshScope; import org.springframework.cloud.context.scope.refresh.RefreshScope;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import com.ctrip.apollo.adminservice.AdminServiceApplication; import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
import com.ctrip.apollo.configservice.ConfigServiceApplication; import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
import com.ctrip.apollo.portal.PortalApplication; import com.ctrip.framework.apollo.portal.PortalApplication;
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
HibernateJpaAutoConfiguration.class}) HibernateJpaAutoConfiguration.class})
......
package com.ctrip.apollo.assembly; package com.ctrip.framework.apollo.assembly;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -10,9 +10,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder; ...@@ -10,9 +10,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.context.scope.refresh.RefreshScope; import org.springframework.cloud.context.scope.refresh.RefreshScope;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import com.ctrip.apollo.adminservice.AdminServiceApplication; import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
import com.ctrip.apollo.configservice.ConfigServiceApplication; import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
import com.ctrip.apollo.portal.PortalApplication; import com.ctrip.framework.apollo.portal.PortalApplication;
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
HibernateJpaAutoConfiguration.class}) HibernateJpaAutoConfiguration.class})
......
package com.ctrip.apollo.biz; package com.ctrip.framework.apollo.biz;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
...@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; ...@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
@EnableAutoConfiguration @EnableAutoConfiguration
@Configuration @Configuration
@ComponentScan(basePackageClasses = com.ctrip.apollo.biz.ApolloBizConfig.class) @ComponentScan(basePackageClasses = ApolloBizConfig.class)
public class ApolloBizConfig { public class ApolloBizConfig {
} }
package com.ctrip.apollo.biz.aop; package com.ctrip.framework.apollo.biz.aop;
import com.dianping.cat.Cat; import com.dianping.cat.Cat;
import com.dianping.cat.message.Message; import com.dianping.cat.message.Message;
......
package com.ctrip.apollo.biz.customize; package com.ctrip.framework.apollo.biz.customize;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.ctrip.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.entity.ServerConfig;
import com.ctrip.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository;
import com.ctrip.framework.foundation.Foundation; import com.ctrip.framework.foundation.Foundation;
import com.dianping.cat.Cat; import com.dianping.cat.Cat;
......
package com.ctrip.apollo.biz.customize; package com.ctrip.framework.apollo.biz.customize;
import org.apache.catalina.connector.Connector; import org.apache.catalina.connector.Connector;
import org.apache.coyote.ProtocolHandler; import org.apache.coyote.ProtocolHandler;
......
package com.ctrip.apollo.biz.datasource; package com.ctrip.framework.apollo.biz.datasource;
import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.type.AnnotatedTypeMetadata; 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 { public class TitanCondition implements Condition {
......
package com.ctrip.apollo.biz.datasource; package com.ctrip.framework.apollo.biz.datasource;
import java.lang.reflect.Method; import java.lang.reflect.Method;
......
package com.ctrip.apollo.biz.datasource; package com.ctrip.framework.apollo.biz.datasource;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ctrip.apollo.core.enums.Env; import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.apollo.core.enums.EnvUtils; import com.ctrip.framework.apollo.core.enums.EnvUtils;
import com.ctrip.framework.foundation.Foundation; import com.ctrip.framework.foundation.Foundation;
@Component @Component
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import java.util.Date; import java.util.Date;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import java.util.Date; import java.util.Date;
......
package com.ctrip.apollo.biz.entity; package com.ctrip.framework.apollo.biz.entity;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
......
package com.ctrip.apollo.biz.eureka; package com.ctrip.framework.apollo.biz.eureka;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.ctrip.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.entity.ServerConfig;
import com.ctrip.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean; import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
......
package com.ctrip.apollo.biz.message; package com.ctrip.framework.apollo.biz.message;
import com.ctrip.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.apollo.biz.repository.ReleaseMessageRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import com.dianping.cat.Cat; import com.dianping.cat.Cat;
import com.dianping.cat.message.Message; import com.dianping.cat.message.Message;
import com.dianping.cat.message.Transaction; import com.dianping.cat.message.Transaction;
......
package com.ctrip.apollo.biz.message; package com.ctrip.framework.apollo.biz.message;
/** /**
* @author Jason Song(song_s@ctrip.com) * @author Jason Song(song_s@ctrip.com)
......
package com.ctrip.apollo.biz.message; package com.ctrip.framework.apollo.biz.message;
/** /**
* @author Jason Song(song_s@ctrip.com) * @author Jason Song(song_s@ctrip.com)
......
package com.ctrip.apollo.biz.message; package com.ctrip.framework.apollo.biz.message;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.ctrip.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.apollo.biz.repository.ReleaseMessageRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import com.ctrip.apollo.core.utils.ApolloThreadFactory; import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.dianping.cat.Cat; import com.dianping.cat.Cat;
import com.dianping.cat.message.Message; import com.dianping.cat.message.Message;
import com.dianping.cat.message.Transaction; import com.dianping.cat.message.Transaction;
......
package com.ctrip.apollo.biz.message; package com.ctrip.framework.apollo.biz.message;
/** /**
* @author Jason Song(song_s@ctrip.com) * @author Jason Song(song_s@ctrip.com)
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import org.springframework.data.repository.PagingAndSortingRepository; 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; import java.util.List;
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import java.util.List; import java.util.List;
...@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; ...@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param; 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> { public interface AppRepository extends PagingAndSortingRepository<App, Long> {
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import java.util.List; import java.util.List;
...@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; ...@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param; 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> { public interface AuditRepository extends PagingAndSortingRepository<Audit, Long> {
......
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; import org.springframework.data.repository.PagingAndSortingRepository;
......
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; import org.springframework.data.repository.PagingAndSortingRepository;
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import java.util.List; import java.util.List;
import org.springframework.data.repository.PagingAndSortingRepository; 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> { public interface ItemRepository extends PagingAndSortingRepository<Item, Long> {
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import java.util.List; import java.util.List;
import org.springframework.data.repository.PagingAndSortingRepository; 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> { public interface NamespaceRepository extends PagingAndSortingRepository<Namespace, Long> {
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import org.springframework.data.repository.PagingAndSortingRepository; 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; import java.util.List;
......
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; import org.springframework.data.repository.PagingAndSortingRepository;
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import java.util.List; import java.util.List;
import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param; 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) * @author Jason Song(song_s@ctrip.com)
......
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; import org.springframework.data.repository.PagingAndSortingRepository;
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
@Service @Service
public class AdminService { public class AdminService {
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
...@@ -9,13 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -9,13 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.entity.AppNamespace; import com.ctrip.framework.apollo.biz.entity.AppNamespace;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.repository.AppNamespaceRepository; import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.apollo.core.exception.ServiceException; import com.ctrip.framework.apollo.core.exception.ServiceException;
import com.ctrip.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.core.utils.StringUtils;
@Service @Service
public class AppNamespaceService { public class AppNamespaceService {
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
...@@ -9,11 +9,11 @@ import org.springframework.data.domain.Pageable; ...@@ -9,11 +9,11 @@ import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.repository.AppRepository; import com.ctrip.framework.apollo.biz.repository.AppRepository;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.exception.ServiceException; import com.ctrip.framework.apollo.core.exception.ServiceException;
@Service @Service
public class AppService { public class AppService {
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.List; import java.util.List;
...@@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.repository.AuditRepository; import com.ctrip.framework.apollo.biz.repository.AuditRepository;
@Service @Service
public class AuditService { public class AuditService {
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -8,12 +8,13 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,12 +8,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.apollo.biz.repository.ClusterRepository; import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.apollo.core.exception.ServiceException; import com.ctrip.framework.apollo.core.exception.ServiceException;
import com.google.common.base.Strings; import com.google.common.base.Strings;
@Service @Service
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import com.ctrip.apollo.biz.entity.Commit; import com.ctrip.framework.apollo.biz.entity.Commit;
import com.ctrip.apollo.biz.repository.CommitRepository; import com.ctrip.framework.apollo.biz.repository.CommitRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import com.ctrip.apollo.biz.entity.Release; import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.apollo.biz.repository.ReleaseRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -7,13 +7,13 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -7,13 +7,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.entity.Item; import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.biz.repository.ItemRepository; import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.apollo.biz.repository.NamespaceRepository; import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.exception.NotFoundException; import com.ctrip.framework.apollo.core.exception.NotFoundException;
@Service @Service
public class ItemService { public class ItemService {
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.entity.Item; import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.apollo.biz.repository.ItemRepository; import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.dto.ItemChangeSets; import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
import com.ctrip.apollo.core.dto.ItemDTO; import com.ctrip.framework.apollo.core.dto.ItemDTO;
@Service @Service
public class ItemSetService { public class ItemSetService {
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -8,12 +8,12 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,12 +8,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.biz.repository.NamespaceRepository; import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
import com.ctrip.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.apollo.core.exception.ServiceException; import com.ctrip.framework.apollo.core.exception.ServiceException;
@Service @Service
public class NamespaceService { public class NamespaceService {
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.entity.Privilege; import com.ctrip.framework.apollo.biz.entity.Privilege;
import com.ctrip.apollo.biz.repository.PrivilegeRepository; import com.ctrip.framework.apollo.biz.repository.PrivilegeRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.entity.Item; import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.biz.entity.Release; import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.apollo.biz.repository.ItemRepository; import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.apollo.biz.repository.ReleaseRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
import com.ctrip.apollo.biz.utils.ReleaseKeyGenerator; import com.ctrip.framework.apollo.biz.utils.ReleaseKeyGenerator;
import com.ctrip.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.core.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.ctrip.apollo.biz.utils; package com.ctrip.framework.apollo.biz.utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
package com.ctrip.apollo.biz.utils; package com.ctrip.framework.apollo.biz.utils;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.core.utils.ByteUtil; import com.ctrip.framework.apollo.core.utils.ByteUtil;
import com.ctrip.apollo.core.utils.MachineUtil; import com.ctrip.framework.apollo.core.utils.MachineUtil;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.text.DateFormat; import java.text.DateFormat;
......
package com.ctrip.apollo.biz; package com.ctrip.framework.apollo.biz;
import com.ctrip.apollo.biz.message.DatabaseMessageSenderTest; import com.ctrip.framework.apollo.biz.message.DatabaseMessageSenderTest;
import com.ctrip.apollo.biz.repository.AppNamespaceRepositoryTest; import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepositoryTest;
import com.ctrip.apollo.biz.repository.AppRepositoryTest; import com.ctrip.framework.apollo.biz.repository.AppRepositoryTest;
import com.ctrip.apollo.biz.service.AdminServiceTest; import com.ctrip.framework.apollo.biz.service.AdminServiceTest;
import com.ctrip.apollo.biz.service.AdminServiceTransactionTest; import com.ctrip.framework.apollo.biz.service.AdminServiceTransactionTest;
import com.ctrip.apollo.biz.service.ConfigServiceTest; import com.ctrip.framework.apollo.biz.service.ConfigServiceTest;
import com.ctrip.apollo.biz.service.PrivilegeServiceTest; import com.ctrip.framework.apollo.biz.service.PrivilegeServiceTest;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Suite; import org.junit.runners.Suite;
......
package com.ctrip.apollo.biz; package com.ctrip.framework.apollo.biz;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
...@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; ...@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
@EnableAutoConfiguration @EnableAutoConfiguration
@ComponentScan(basePackages = "com.ctrip.apollo.biz") @ComponentScan(basePackages = "com.ctrip.framework.apollo.biz")
public class BizTestConfiguration { public class BizTestConfiguration {
} }
package com.ctrip.apollo.biz.eureka; package com.ctrip.framework.apollo.biz.eureka;
import com.ctrip.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.entity.ServerConfig;
import com.ctrip.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
......
package com.ctrip.apollo.biz.message; package com.ctrip.framework.apollo.biz.message;
import com.ctrip.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.apollo.biz.repository.ReleaseMessageRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
......
package com.ctrip.apollo.biz.message; package com.ctrip.framework.apollo.biz.message;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.SettableFuture;
import com.ctrip.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.apollo.biz.repository.ReleaseMessageRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.apollo.biz.BizTestConfiguration; import com.ctrip.framework.apollo.biz.BizTestConfiguration;
import com.ctrip.apollo.biz.entity.AppNamespace; import com.ctrip.framework.apollo.biz.entity.AppNamespace;
import com.ctrip.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
......
package com.ctrip.apollo.biz.repository; package com.ctrip.framework.apollo.biz.repository;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
...@@ -9,8 +9,8 @@ import org.springframework.test.annotation.Rollback; ...@@ -9,8 +9,8 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.BizTestConfiguration; import com.ctrip.framework.apollo.biz.BizTestConfiguration;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = BizTestConfiguration.class) @SpringApplicationConfiguration(classes = BizTestConfiguration.class)
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -12,14 +12,14 @@ import org.springframework.test.annotation.Rollback; ...@@ -12,14 +12,14 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.BizTestConfiguration; import com.ctrip.framework.apollo.biz.BizTestConfiguration;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.biz.repository.AppRepository; import com.ctrip.framework.apollo.biz.repository.AppRepository;
import com.ctrip.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.apollo.core.exception.ServiceException; import com.ctrip.framework.apollo.core.exception.ServiceException;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = BizTestConfiguration.class) @SpringApplicationConfiguration(classes = BizTestConfiguration.class)
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.Date; import java.util.Date;
...@@ -16,12 +16,12 @@ import org.springframework.test.context.transaction.AfterTransaction; ...@@ -16,12 +16,12 @@ import org.springframework.test.context.transaction.AfterTransaction;
import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.test.context.transaction.BeforeTransaction;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.BizTestConfiguration; import com.ctrip.framework.apollo.biz.BizTestConfiguration;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.biz.repository.AppNamespaceRepository; import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
import com.ctrip.apollo.biz.repository.AppRepository; import com.ctrip.framework.apollo.biz.repository.AppRepository;
import com.ctrip.apollo.biz.repository.ClusterRepository; import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
import com.ctrip.apollo.biz.repository.NamespaceRepository; import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = BizTestConfiguration.class) @SpringApplicationConfiguration(classes = BizTestConfiguration.class)
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.Date; import java.util.Date;
...@@ -10,9 +10,9 @@ import org.springframework.test.annotation.Rollback; ...@@ -10,9 +10,9 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.BizTestConfiguration; import com.ctrip.framework.apollo.biz.BizTestConfiguration;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.core.exception.ServiceException; import com.ctrip.framework.apollo.core.exception.ServiceException;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = BizTestConfiguration.class) @SpringApplicationConfiguration(classes = BizTestConfiguration.class)
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import com.ctrip.apollo.biz.entity.Release; import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.apollo.biz.repository.ReleaseRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
......
package com.ctrip.apollo.biz.service; package com.ctrip.framework.apollo.biz.service;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -12,11 +12,11 @@ import org.springframework.test.annotation.Rollback; ...@@ -12,11 +12,11 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ctrip.apollo.biz.BizTestConfiguration; import com.ctrip.framework.apollo.biz.BizTestConfiguration;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.framework.apollo.biz.entity.App;
import com.ctrip.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.apollo.biz.entity.Privilege; import com.ctrip.framework.apollo.biz.entity.Privilege;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = BizTestConfiguration.class) @SpringApplicationConfiguration(classes = BizTestConfiguration.class)
......
package com.ctrip.apollo.biz.utils; package com.ctrip.framework.apollo.biz.utils;
import com.google.common.collect.Sets; 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.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
......
package com.ctrip.apollo.cat; package com.ctrip.framework.apollo.cat;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
......
package com.ctrip.apollo.cat; package com.ctrip.framework.apollo.cat;
import org.codehaus.plexus.logging.console.ConsoleLoggerManager; import org.codehaus.plexus.logging.console.ConsoleLoggerManager;
......
package com.ctrip.apollo.cat; package com.ctrip.framework.apollo.cat;
import java.io.IOException; import java.io.IOException;
......
package com.ctrip.apollo.cat; package com.ctrip.framework.apollo.cat;
import com.dianping.cat.message.io.MessageSender; import com.dianping.cat.message.io.MessageSender;
import com.dianping.cat.message.io.TransportManager; import com.dianping.cat.message.io.TransportManager;
......
package com.ctrip.apollo; package com.ctrip.framework.apollo;
/** /**
* @author Jason Song(song_s@ctrip.com) * @author Jason Song(song_s@ctrip.com)
......
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) * @author Jason Song(song_s@ctrip.com)
......
package com.ctrip.apollo; package com.ctrip.framework.apollo;
import com.ctrip.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.apollo.internals.ConfigManager; import com.ctrip.framework.apollo.internals.ConfigManager;
import com.ctrip.apollo.spi.ConfigFactory; import com.ctrip.framework.apollo.spi.ConfigFactory;
import com.ctrip.apollo.spi.ConfigRegistry; import com.ctrip.framework.apollo.spi.ConfigRegistry;
import com.dianping.cat.Cat; import com.dianping.cat.Cat;
import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.PlexusContainer;
......
package com.ctrip.apollo.build; package com.ctrip.framework.apollo.build;
import com.ctrip.apollo.internals.ConfigServiceLocator; import com.ctrip.framework.apollo.internals.ConfigServiceLocator;
import com.ctrip.apollo.internals.DefaultConfigManager; import com.ctrip.framework.apollo.internals.DefaultConfigManager;
import com.ctrip.apollo.spi.DefaultConfigFactory; import com.ctrip.framework.apollo.spi.DefaultConfigFactory;
import com.ctrip.apollo.spi.DefaultConfigFactoryManager; import com.ctrip.framework.apollo.spi.DefaultConfigFactoryManager;
import com.ctrip.apollo.spi.DefaultConfigRegistry; import com.ctrip.framework.apollo.spi.DefaultConfigRegistry;
import com.ctrip.apollo.util.ConfigUtil; import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.apollo.util.http.HttpUtil; import com.ctrip.framework.apollo.util.http.HttpUtil;
import org.unidal.lookup.configuration.AbstractResourceConfigurator; import org.unidal.lookup.configuration.AbstractResourceConfigurator;
import org.unidal.lookup.configuration.Component; import org.unidal.lookup.configuration.Component;
......
package com.ctrip.apollo.internals; package com.ctrip.framework.apollo.internals;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.ctrip.apollo.Config; import com.ctrip.framework.apollo.Config;
import com.ctrip.apollo.ConfigChangeListener; import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.apollo.enums.PropertyChangeType; import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.apollo.model.ConfigChangeEvent; import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.dianping.cat.Cat; import com.dianping.cat.Cat;
import org.slf4j.Logger; import org.slf4j.Logger;
......
package com.ctrip.apollo.internals; package com.ctrip.framework.apollo.internals;
import com.google.common.collect.Lists; 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 com.dianping.cat.Cat;
import org.slf4j.Logger; import org.slf4j.Logger;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment