Skip to content

A
apollo
Commit 0b3ace80 authored by Jason Song's avatar Jason Song
Browse files
Options

Merge pull request #209 from lepdou/rename 

Rename
parents 9fe11a24 9e3b6bd2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 936 additions and 838 deletions
apollo-adminservice/pom.xml
View file @ 0b3ace80
......@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
......@@ -16,11 +16,11 @@
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-buildtools</artifactId>
<scope>test</scope>
</dependency>
......
apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/AdminServiceApplication.java → apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceApplication.java
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
......@@ -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>
\ No newline at end of file
</plexus>
apollo-assembly/pom.xml
View file @ 0b3ace80
......@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
......@@ -16,15 +16,15 @@
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
</dependency>
<dependency>
......
apollo-assembly/src/main/java/com/ctrip/apollo/assembly/ApolloApplication.java → apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java
View file @ 0b3ace80
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
View file @ 0b3ace80
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/pom.xml
View file @ 0b3ace80
......@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -15,7 +15,7 @@
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<dependency>
......
apollo-biz/src/main/java/com/ctrip/apollo/biz/ApolloBizConfig.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/ApolloBizConfig.java
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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/Cluster.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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/ServerConfig.java → apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServerConfig.java
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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
View file @ 0b3ace80
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/pom.xml
View file @ 0b3ace80
......@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
......
apollo-buildtools/src/main/java/com/ctrip/apollo/cat/NullClientConfigManager.java → apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullClientConfigManager.java
View file @ 0b3ace80
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
View file @ 0b3ace80
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/NullTransportManager.java → apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullTransportManager.java
View file @ 0b3ace80
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/README.md
View file @ 0b3ace80
## Maven Dependency
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
......@@ -37,4 +37,4 @@ Config config = ConfigService.getConfig(somePublicNamespace);
String someKey = "someKeyFromPublicNamespace";
String someDefaultValue = "someDefaultValueForTheKey";
System.out.println(String.format("Value for key %s is %s", someKey, config.getProperty(someKey, someDefaultValue)));
```
\ No newline at end of file
```
apollo-client/pom.xml
View file @ 0b3ace80
......@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
......@@ -17,11 +17,11 @@
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-core</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.apollo</groupId>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-buildtools</artifactId>
<scope>test</scope>
</dependency>
......
apollo-client/src/main/java/com/ctrip/apollo/Config.java → apollo-client/src/main/java/com/ctrip/framework/apollo/Config.java
View file @ 0b3ace80
package com.ctrip.apollo;
package com.ctrip.framework.apollo;
/**
* @author Jason Song(song_s@ctrip.com)
......
apollo-client/src/test/resources/log4j2.xml
View file @ 0b3ace80
This diff is collapsed.
apollo-common/pom.xml
View file @ 0b3ace80
This diff is collapsed.
apollo-configservice/pom.xml
View file @ 0b3ace80
This diff is collapsed.
apollo-core/pom.xml
View file @ 0b3ace80
This diff is collapsed.
apollo-demo/pom.xml
View file @ 0b3ace80
This diff is collapsed.
apollo-demo/src/main/resources/log4j2.xml
View file @ 0b3ace80
This diff is collapsed.
apollo-portal/pom.xml
View file @ 0b3ace80
This diff is collapsed.
application.pid deleted 100644 → 0
View file @ 9fe11a24
This diff is collapsed.
pom.xml
View file @ 0b3ace80
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