Merge pull request #134 from yiming187/build

Add assembly script

apollo-adminservice/pom.xml

@@ -79,6 +79,24 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

apollo-adminservice/src/assembly/assembly-descriptor.xml

+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<!--scripts -->
+		<fileSet>
+			<directory>src/main/scripts</directory>
+			<outputDirectory>bin</outputDirectory>
+			<includes>
+				<include>*.sh</include>
+			</includes>
+			<fileMode>0755</fileMode>
+			<lineEnding>unix</lineEnding>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/config</directory>
+			<outputDirectory>config</outputDirectory>
+		</fileSet>
+		<!--artifact -->
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>${project.artifactId}-*.jar</include>
+			</includes>
+			<fileMode>0444</fileMode>
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file

apollo-adminservice/src/main/config/app.properties

+appId=100003172
+jdkVersion=1.8
\ No newline at end of file

apollo-adminservice/src/main/scripts/common.sh

+#!/bin/bash
+
+# directories
+SYSOUT_LOG=$LOG_PATH/sysout.log
+mkdir -p $LOG_PATH
+PID_PATH_NAME=$SERVICE_NAME".pid"
+
+case $1 in
+    start)
+        echo "Starting $SERVICE_NAME ..."
+        if [ ! -f $PID_PATH_NAME ]; then
+            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
+                        echo $! > $PID_PATH_NAME
+            echo "$SERVICE_NAME started ..."
+        else
+            echo "$SERVICE_NAME is already running ..."
+        fi
+    ;;
+    stop)
+        if [ -f $PID_PATH_NAME ]; then
+            PID=$(cat $PID_PATH_NAME);
+            echo "$SERVICE_NAME stopping ..."
+            kill $PID;
+            echo "$SERVICE_NAME stopped ..."
+            rm $PID_PATH_NAME
+        else
+            echo "$SERVICE_NAME is not running ..."
+        fi
+    ;;
+    restart)
+        if [ -f $PID_PATH_NAME ]; then
+            PID=$(cat $PID_PATH_NAME);
+            echo "$SERVICE_NAME stopping ...";
+            kill $PID;
+            echo "$SERVICE_NAME stopped ...";
+            rm $PID_PATH_NAME
+            echo "$SERVICE_NAME starting ..."
+            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
+                        echo $! > $PID_PATH_NAME
+            echo "$SERVICE_NAME started ..."
+        else
+            echo "$SERVICE_NAME is not running ..."
+        fi
+    ;;
+esac
+exit 0
\ No newline at end of file

apollo-adminservice/src/main/scripts/shutdown.sh

+#!/bin/bash
+SERVICE_NAME=apollo-adminservice
+PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
+LOG_PATH=/opt/logs/100003172/
+
+source bin/common.sh stop
\ No newline at end of file

apollo-adminservice/src/main/scripts/startup.sh

+#!/bin/bash
+SERVICE_NAME=apollo-adminservice
+PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
+LOG_PATH=/opt/logs/100003172/
+
+source bin/common.sh start
+

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

 package com.ctrip.apollo;
 
-import com.ctrip.apollo.core.ConfigConsts;
 import com.ctrip.apollo.internals.ConfigManager;
 import com.ctrip.apollo.spi.ConfigFactory;
 import com.ctrip.apollo.spi.ConfigRegistry;

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

 package com.ctrip.apollo;
 
-import com.ctrip.apollo.core.ConfigConsts;
 import com.ctrip.apollo.spi.ConfigFactory;
 import com.ctrip.apollo.util.ConfigUtil;
 

apollo-configservice/pom.xml

@@ -82,6 +82,24 @@
 					<executable>true</executable>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

apollo-configservice/src/assembly/assembly-descriptor.xml

+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<!--scripts -->
+		<fileSet>
+			<directory>src/main/scripts</directory>
+			<outputDirectory>bin</outputDirectory>
+			<includes>
+				<include>*.sh</include>
+			</includes>
+			<fileMode>0755</fileMode>
+			<lineEnding>unix</lineEnding>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/config</directory>
+			<outputDirectory>config</outputDirectory>
+		</fileSet>
+		<!--artifact -->
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>${project.artifactId}-*.jar</include>
+			</includes>
+			<fileMode>0444</fileMode>
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file

apollo-configservice/src/main/config/app.properties

+appId=100003171
+jdkVersion=1.8
\ No newline at end of file

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

@@ -4,7 +4,6 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 
-import com.ctrip.apollo.core.ConfigConsts;
 import com.ctrip.apollo.core.dto.ApolloConfigNotification;
 import com.ctrip.apollo.core.utils.ApolloThreadFactory;
 

apollo-configservice/src/main/scripts/common.sh

+#!/bin/bash
+
+# directories
+SYSOUT_LOG=$LOG_PATH/sysout.log
+mkdir -p $LOG_PATH
+PID_PATH_NAME=$SERVICE_NAME".pid"
+
+case $1 in
+    start)
+        echo "Starting $SERVICE_NAME ..."
+        if [ ! -f $PID_PATH_NAME ]; then
+            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
+                        echo $! > $PID_PATH_NAME
+            echo "$SERVICE_NAME started ..."
+        else
+            echo "$SERVICE_NAME is already running ..."
+        fi
+    ;;
+    stop)
+        if [ -f $PID_PATH_NAME ]; then
+            PID=$(cat $PID_PATH_NAME);
+            echo "$SERVICE_NAME stopping ..."
+            kill $PID;
+            echo "$SERVICE_NAME stopped ..."
+            rm $PID_PATH_NAME
+        else
+            echo "$SERVICE_NAME is not running ..."
+        fi
+    ;;
+    restart)
+        if [ -f $PID_PATH_NAME ]; then
+            PID=$(cat $PID_PATH_NAME);
+            echo "$SERVICE_NAME stopping ...";
+            kill $PID;
+            echo "$SERVICE_NAME stopped ...";
+            rm $PID_PATH_NAME
+            echo "$SERVICE_NAME starting ..."
+            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
+                        echo $! > $PID_PATH_NAME
+            echo "$SERVICE_NAME started ..."
+        else
+            echo "$SERVICE_NAME is not running ..."
+        fi
+    ;;
+esac
+exit 0
\ No newline at end of file

apollo-configservice/src/main/scripts/shutdown.sh

+#!/bin/bash
+SERVICE_NAME=apollo-configservice
+PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
+LOG_PATH=/opt/logs/100003171/
+
+source bin/common.sh stop
\ No newline at end of file

apollo-configservice/src/main/scripts/startup.sh

+#!/bin/bash
+SERVICE_NAME=apollo-configservice
+PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
+LOG_PATH=/opt/logs/100003171/
+
+source bin/common.sh start
+

apollo-portal/pom.xml

@@ -25,6 +25,24 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

apollo-portal/src/assembly/assembly-descriptor.xml

+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<!--scripts -->
+		<fileSet>
+			<directory>src/main/scripts</directory>
+			<outputDirectory>bin</outputDirectory>
+			<includes>
+				<include>*.sh</include>
+			</includes>
+			<fileMode>0755</fileMode>
+			<lineEnding>unix</lineEnding>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/config</directory>
+			<outputDirectory>config</outputDirectory>
+		</fileSet>
+		<!--artifact -->
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>${project.artifactId}-*.jar</include>
+			</includes>
+			<fileMode>0444</fileMode>
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file

apollo-portal/src/main/config/app.properties

+appId=100003171
+jdkVersion=1.8
\ No newline at end of file

apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java

@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ctrip.apollo.core.dto.AppDTO;
-import com.ctrip.apollo.core.enums.Env;
 import com.ctrip.apollo.core.exception.BadRequestException;
 import com.ctrip.apollo.core.utils.StringUtils;
 import com.ctrip.apollo.portal.entity.ClusterNavTree;

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/ConfigService.java

@@ -22,11 +22,8 @@ import com.ctrip.apollo.portal.entity.form.NamespaceTextModel;
 import com.ctrip.apollo.portal.entity.NamespaceVO;
 import com.ctrip.apollo.portal.entity.form.NamespaceReleaseModel;
 import com.ctrip.apollo.portal.service.txtresolver.ConfigTextResolver;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
-import java.io.IOException;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;

apollo-portal/src/main/scripts/common.sh

+#!/bin/bash
+
+# directories
+SYSOUT_LOG=$LOG_PATH/sysout.log
+mkdir -p $LOG_PATH
+PID_PATH_NAME=$SERVICE_NAME".pid"
+
+case $1 in
+    start)
+        echo "Starting $SERVICE_NAME ..."
+        if [ ! -f $PID_PATH_NAME ]; then
+            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
+                        echo $! > $PID_PATH_NAME
+            echo "$SERVICE_NAME started ..."
+        else
+            echo "$SERVICE_NAME is already running ..."
+        fi
+    ;;
+    stop)
+        if [ -f $PID_PATH_NAME ]; then
+            PID=$(cat $PID_PATH_NAME);
+            echo "$SERVICE_NAME stopping ..."
+            kill $PID;
+            echo "$SERVICE_NAME stopped ..."
+            rm $PID_PATH_NAME
+        else
+            echo "$SERVICE_NAME is not running ..."
+        fi
+    ;;
+    restart)
+        if [ -f $PID_PATH_NAME ]; then
+            PID=$(cat $PID_PATH_NAME);
+            echo "$SERVICE_NAME stopping ...";
+            kill $PID;
+            echo "$SERVICE_NAME stopped ...";
+            rm $PID_PATH_NAME
+            echo "$SERVICE_NAME starting ..."
+            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
+                        echo $! > $PID_PATH_NAME
+            echo "$SERVICE_NAME started ..."
+        else
+            echo "$SERVICE_NAME is not running ..."
+        fi
+    ;;
+esac
+exit 0
\ No newline at end of file

apollo-portal/src/main/scripts/shutdown.sh

+#!/bin/bash
+SERVICE_NAME=apollo-portal
+PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
+LOG_PATH=/opt/logs/100003173/
+
+source bin/common.sh stop
\ No newline at end of file

apollo-portal/src/main/scripts/startup.sh

+#!/bin/bash
+SERVICE_NAME=apollo-portal
+PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
+LOG_PATH=/opt/logs/100003173/
+
+source bin/common.sh start
+

apollo-portal/src/test/java/com/ctrip/apollo/portal/AppServiceTest.java

 package com.ctrip.apollo.portal;
 
-import com.ctrip.apollo.core.dto.AppDTO;
 import com.ctrip.apollo.core.dto.ClusterDTO;
 import com.ctrip.apollo.core.enums.Env;
 import com.ctrip.apollo.portal.api.AdminServiceAPI;
@@ -15,7 +14,6 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;

pom.xml

@@ -126,6 +126,21 @@
 				<artifactId>cat-client</artifactId>
 				<version>1.4.6</version>
 			</dependency>
+			<dependency>
+				<groupId>com.ctrip.platform</groupId>
+				<artifactId>ctrip-dal-client</artifactId>
+				<version>1.0.1.6</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>logback-core</artifactId>
+						<groupId>ch.qos.logback</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>logback-classic</artifactId>
+						<groupId>ch.qos.logback</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 			<!--third party -->
 			<dependency>
 				<groupId>mysql</groupId>
@@ -324,26 +339,65 @@
 			</build>
 		</profile>
 		<profile>
-			<id>ctrip</id>
+			<id>local</id>
+			<properties>
+				<package.environment>local</package.environment>
+			</properties>
+		</profile>
+		<profile>
+			<id>dev</id>
+			<properties>
+				<package.environment>dev</package.environment>
+			</properties>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+		<profile>
+			<id>fat</id>
+			<properties>
+				<package.environment>fat</package.environment>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>com.ctrip.platform</groupId>
 					<artifactId>ctrip-dal-client</artifactId>
-					<version>1.0.1.6</version>
-					<exclusions>
-						<exclusion>
-							<artifactId>logback-core</artifactId>
-							<groupId>ch.qos.logback</groupId>
-						</exclusion>
-						<exclusion>
-							<artifactId>logback-classic</artifactId>
-							<groupId>ch.qos.logback</groupId>
-						</exclusion>
-					</exclusions>
 				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>uat</id>
+			<properties>
+				<package.environment>uat</package.environment>
+			</properties>
+			<dependencies>
 				<dependency>
-					<groupId>ch.qos.logback</groupId>
-					<artifactId>logback-classic</artifactId>
+					<groupId>com.ctrip.platform</groupId>
+					<artifactId>ctrip-dal-client</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>prod</id>
+			<properties>
+				<package.environment>prod</package.environment>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>com.ctrip.platform</groupId>
+					<artifactId>ctrip-dal-client</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>tools</id>
+			<properties>
+				<package.environment>tools</package.environment>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>com.ctrip.platform</groupId>
+					<artifactId>ctrip-dal-client</artifactId>
 				</dependency>
 			</dependencies>
 		</profile>