Merge pull request #155 from yiming187/jenkins_update

.gitignore

@@ -24,5 +24,3 @@ target
 
 # git
 *.orig
-
-application-dev.properties
\ No newline at end of file

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

@@ -2,5 +2,6 @@
 SERVICE_NAME=apollo-adminservice
 
 cd `dirname $0`/..
-./$SERVICE_NAME".jar" stop
-
+if [[ -f $SERVICE_NAME".jar" ]]; then
+  ./$SERVICE_NAME".jar" stop
+fi

apollo-biz/src/main/resources/application-dev.example.properties

-# DataSource
-spring.datasource.url = 
-spring.datasource.username = 
-spring.datasource.password = 

apollo-biz/src/main/resources/application-dev.properties

+# DataSource
+spring.datasource.url = ${spring_datasource_url}
+spring.datasource.username = ${spring_datasource_username}
+spring.datasource.password = ${spring_datasource_password}

apollo-buildtools/pom.xml

@@ -20,4 +20,28 @@
 			<artifactId>cat-client</artifactId>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/target</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/scripts</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

apollo-buildtools/src/main/scripts/deploy_jenkins.sh

@@ -28,10 +28,10 @@ APP_NAME=$1
 APP_DIR=$APP_BASE_DIR/$APP_NAME
 APP_RELEASE_DIR=$APP_BASE_DIR/apollo-$APP_NAME.releases/`date "+%Y-%m-%d.%H.%M.%S"`
 APP_STARTUP_SCRIPT=$APP_DIR/bin/startup.sh
-APP_SHUTDOWN_SCRIPTS=$APP_DIR/bin/shutdown.sh
+APP_SHUTDOWN_SCRIPT=$APP_DIR/bin/shutdown.sh
 
 if [ -e $APP_STARTUP_SCRIPT ];then
-	$APP_SHUTDOWN_SCRIPTS
+	$APP_SHUTDOWN_SCRIPT
 fi
 
 mkdir -p $APP_RELEASE_DIR

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

@@ -2,4 +2,6 @@
 SERVICE_NAME=apollo-configservice
 
 cd `dirname $0`/..
-./$SERVICE_NAME".jar" stop
+if [[ -f $SERVICE_NAME".jar" ]]; then
\ No newline at end of file
+  ./$SERVICE_NAME".jar" stop
+fi
\ No newline at end of file

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

@@ -2,4 +2,6 @@
 SERVICE_NAME=apollo-portal
 
 cd `dirname $0`/..
-./$SERVICE_NAME".jar" stop
+if [[ -f $SERVICE_NAME".jar" ]]; then
\ No newline at end of file
+  ./$SERVICE_NAME".jar" stop
+fi
\ No newline at end of file

pom.xml

@@ -292,6 +292,11 @@
 					<artifactId>maven-release-plugin</artifactId>
 					<version>2.5.3</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.6</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -369,9 +374,9 @@
 			</build>
 		</profile>
 		<profile>
-			<id>local</id>
+			<id>dev</id>
 			<properties>
-				<package.environment>local</package.environment>
+				<package.environment>dev</package.environment>
 			</properties>
 			<activation>
 				<activeByDefault>true</activeByDefault>