Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
39fb6a84
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
39fb6a84
编写于
4月 28, 2016
作者:
J
Jason Song
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #152 from yiming187/update
update assembly
上级
f5898737
471c659a
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
174 addition
and
164 deletion
+174
-164
apollo-adminservice/src/assembly/assembly-descriptor.xml
apollo-adminservice/src/assembly/assembly-descriptor.xml
+36
-23
apollo-buildtools/src/main/scripts/common.sh
apollo-buildtools/src/main/scripts/common.sh
+0
-0
apollo-common/src/main/java/com/ctrip/apollo/common/controller/ApolloInfoController.java
.../ctrip/apollo/common/controller/ApolloInfoController.java
+37
-0
apollo-configservice/src/assembly/assembly-descriptor.xml
apollo-configservice/src/assembly/assembly-descriptor.xml
+36
-23
apollo-configservice/src/main/scripts/common.sh
apollo-configservice/src/main/scripts/common.sh
+0
-46
apollo-core/src/main/java/com/ctrip/apollo/Apollo.java
apollo-core/src/main/java/com/ctrip/apollo/Apollo.java
+2
-1
apollo-portal/src/assembly/assembly-descriptor.xml
apollo-portal/src/assembly/assembly-descriptor.xml
+36
-23
apollo-portal/src/main/scripts/common.sh
apollo-portal/src/main/scripts/common.sh
+0
-46
pom.xml
pom.xml
+27
-2
未找到文件。
apollo-adminservice/src/assembly/assembly-descriptor.xml
浏览文件 @
39fb6a84
...
@@ -2,33 +2,46 @@
...
@@ -2,33 +2,46 @@
xmlns=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
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"
>
xsi:schemaLocation=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"
>
<id>
apollo-adminservice
</id>
<formats>
<formats>
<format>
zip
</format>
<format>
zip
</format>
</formats>
</formats>
<includeBaseDirectory>
false
</includeBaseDirectory>
<includeBaseDirectory>
false
</includeBaseDirectory>
<fileSets>
<moduleSets>
<!--scripts -->
<moduleSet>
<fileSet>
<useAllReactorProjects>
true
</useAllReactorProjects>
<directory>
src/main/scripts
</directory>
<outputDirectory>
bin
</outputDirectory>
<includes>
<includes>
<include>
*.sh
</include>
<include>
*:apollo-buildtools:*
</include>
<include>
*:apollo-adminervice:*
</include>
</includes>
</includes>
<fileMode>
0755
</fileMode>
<sources>
<lineEnding>
unix
</lineEnding>
<includeModuleDirectory>
false
</includeModuleDirectory>
</fileSet>
<fileSets>
<fileSet>
<!--scripts -->
<directory>
src/main/config
</directory>
<fileSet>
<outputDirectory>
config
</outputDirectory>
<directory>
src/main/scripts
</directory>
</fileSet>
<outputDirectory>
bin
</outputDirectory>
<!--artifact -->
<includes>
<fileSet>
<include>
*.sh
</include>
<directory>
target
</directory>
</includes>
<outputDirectory>
/
</outputDirectory>
<fileMode>
0755
</fileMode>
<includes>
<lineEnding>
unix
</lineEnding>
<include>
${project.artifactId}-*.jar
</include>
</fileSet>
</includes>
<fileSet>
<fileMode>
0444
</fileMode>
<directory>
src/main/config
</directory>
</fileSet>
<outputDirectory>
config
</outputDirectory>
</fileSets>
</fileSet>
<!--artifact -->
<fileSet>
<directory>
target
</directory>
<outputDirectory>
/
</outputDirectory>
<includes>
<include>
${project.artifactId}-*.jar
</include>
</includes>
<fileMode>
0444
</fileMode>
</fileSet>
</fileSets>
</sources>
</moduleSet>
</moduleSets>
</assembly>
</assembly>
\ No newline at end of file
apollo-
adminservice
/src/main/scripts/common.sh
→
apollo-
buildtools
/src/main/scripts/common.sh
浏览文件 @
39fb6a84
文件已移动
apollo-common/src/main/java/com/ctrip/apollo/common/controller/ApolloInfoController.java
0 → 100644
浏览文件 @
39fb6a84
package
com.ctrip.apollo.common.controller
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ctrip.apollo.Apollo
;
import
com.ctrip.framework.foundation.Foundation
;
@RestController
@RequestMapping
(
path
=
"/apollo"
)
public
class
ApolloInfoController
{
@RequestMapping
(
"app"
)
public
String
getApp
()
{
return
Foundation
.
app
().
toString
();
}
@RequestMapping
(
"web"
)
public
String
getEnv
()
{
return
Foundation
.
web
().
toString
();
}
@RequestMapping
(
"net"
)
public
String
getNet
()
{
return
Foundation
.
net
().
toString
();
}
@RequestMapping
(
"server"
)
public
String
getServer
()
{
return
Foundation
.
server
().
toString
();
}
@RequestMapping
(
"version"
)
public
String
getVersion
()
{
return
Apollo
.
VERSION
;
}
}
apollo-configservice/src/assembly/assembly-descriptor.xml
浏览文件 @
39fb6a84
...
@@ -2,33 +2,46 @@
...
@@ -2,33 +2,46 @@
xmlns=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
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"
>
xsi:schemaLocation=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"
>
<id>
apollo-configservice
</id>
<formats>
<formats>
<format>
zip
</format>
<format>
zip
</format>
</formats>
</formats>
<includeBaseDirectory>
false
</includeBaseDirectory>
<includeBaseDirectory>
false
</includeBaseDirectory>
<fileSets>
<moduleSets>
<!--scripts -->
<moduleSet>
<fileSet>
<useAllReactorProjects>
true
</useAllReactorProjects>
<directory>
src/main/scripts
</directory>
<outputDirectory>
bin
</outputDirectory>
<includes>
<includes>
<include>
*.sh
</include>
<include>
*:apollo-buildtools:*
</include>
<include>
*:apollo-configservice:*
</include>
</includes>
</includes>
<fileMode>
0755
</fileMode>
<sources>
<lineEnding>
unix
</lineEnding>
<includeModuleDirectory>
false
</includeModuleDirectory>
</fileSet>
<fileSets>
<fileSet>
<!--scripts -->
<directory>
src/main/config
</directory>
<fileSet>
<outputDirectory>
config
</outputDirectory>
<directory>
src/main/scripts
</directory>
</fileSet>
<outputDirectory>
bin
</outputDirectory>
<!--artifact -->
<includes>
<fileSet>
<include>
*.sh
</include>
<directory>
target
</directory>
</includes>
<outputDirectory>
/
</outputDirectory>
<fileMode>
0755
</fileMode>
<includes>
<lineEnding>
unix
</lineEnding>
<include>
${project.artifactId}-*.jar
</include>
</fileSet>
</includes>
<fileSet>
<fileMode>
0444
</fileMode>
<directory>
src/main/config
</directory>
</fileSet>
<outputDirectory>
config
</outputDirectory>
</fileSets>
</fileSet>
<!--artifact -->
<fileSet>
<directory>
target
</directory>
<outputDirectory>
/
</outputDirectory>
<includes>
<include>
${project.artifactId}-*.jar
</include>
</includes>
<fileMode>
0444
</fileMode>
</fileSet>
</fileSets>
</sources>
</moduleSet>
</moduleSets>
</assembly>
</assembly>
\ No newline at end of file
apollo-configservice/src/main/scripts/common.sh
已删除
100644 → 0
浏览文件 @
f5898737
#!/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-core/src/main/java/com/ctrip/apollo/Apollo.java
浏览文件 @
39fb6a84
...
@@ -4,5 +4,6 @@ package com.ctrip.apollo;
...
@@ -4,5 +4,6 @@ package com.ctrip.apollo;
* @author Jason Song(song_s@ctrip.com)
* @author Jason Song(song_s@ctrip.com)
*/
*/
public
class
Apollo
{
public
class
Apollo
{
public
final
static
String
VERSION
=
"java-0.0.1-SNAPSHOT"
;
public
final
static
String
VERSION
=
"java-"
+
Apollo
.
class
.
getPackage
().
getImplementationVersion
();
}
}
apollo-portal/src/assembly/assembly-descriptor.xml
浏览文件 @
39fb6a84
...
@@ -2,33 +2,46 @@
...
@@ -2,33 +2,46 @@
xmlns=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
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"
>
xsi:schemaLocation=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"
>
<id>
apollo-portal
</id>
<formats>
<formats>
<format>
zip
</format>
<format>
zip
</format>
</formats>
</formats>
<includeBaseDirectory>
false
</includeBaseDirectory>
<includeBaseDirectory>
false
</includeBaseDirectory>
<fileSets>
<moduleSets>
<!--scripts -->
<moduleSet>
<fileSet>
<useAllReactorProjects>
true
</useAllReactorProjects>
<directory>
src/main/scripts
</directory>
<outputDirectory>
bin
</outputDirectory>
<includes>
<includes>
<include>
*.sh
</include>
<include>
*:apollo-buildtools:*
</include>
<include>
*:apollo-portal:*
</include>
</includes>
</includes>
<fileMode>
0755
</fileMode>
<sources>
<lineEnding>
unix
</lineEnding>
<includeModuleDirectory>
false
</includeModuleDirectory>
</fileSet>
<fileSets>
<fileSet>
<!--scripts -->
<directory>
src/main/config
</directory>
<fileSet>
<outputDirectory>
config
</outputDirectory>
<directory>
src/main/scripts
</directory>
</fileSet>
<outputDirectory>
bin
</outputDirectory>
<!--artifact -->
<includes>
<fileSet>
<include>
*.sh
</include>
<directory>
target
</directory>
</includes>
<outputDirectory>
/
</outputDirectory>
<fileMode>
0755
</fileMode>
<includes>
<lineEnding>
unix
</lineEnding>
<include>
${project.artifactId}-*.jar
</include>
</fileSet>
</includes>
<fileSet>
<fileMode>
0444
</fileMode>
<directory>
src/main/config
</directory>
</fileSet>
<outputDirectory>
config
</outputDirectory>
</fileSets>
</fileSet>
<!--artifact -->
<fileSet>
<directory>
target
</directory>
<outputDirectory>
/
</outputDirectory>
<includes>
<include>
${project.artifactId}-*.jar
</include>
</includes>
<fileMode>
0444
</fileMode>
</fileSet>
</fileSets>
</sources>
</moduleSet>
</moduleSets>
</assembly>
</assembly>
\ No newline at end of file
apollo-portal/src/main/scripts/common.sh
已删除
100644 → 0
浏览文件 @
f5898737
#!/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
pom.xml
浏览文件 @
39fb6a84
...
@@ -84,7 +84,6 @@
...
@@ -84,7 +84,6 @@
<jetty.version>
9.2.15.v20160210
</jetty.version>
<jetty.version>
9.2.15.v20160210
</jetty.version>
<github.global.server>
github
</github.global.server>
<github.global.server>
github
</github.global.server>
<github.global.oauth2Token>
${env.GITHUB_OAUTH_TOKEN}
</github.global.oauth2Token>
<github.global.oauth2Token>
${env.GITHUB_OAUTH_TOKEN}
</github.global.oauth2Token>
<github.path></github.path>
</properties>
</properties>
<modules>
<modules>
...
@@ -250,7 +249,7 @@
...
@@ -250,7 +249,7 @@
<dependency>
<dependency>
<groupId>
com.ctrip.apollo
</groupId>
<groupId>
com.ctrip.apollo
</groupId>
<artifactId>
apollo-buildtools
</artifactId>
<artifactId>
apollo-buildtools
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<version>
${project.version}
</version>
</dependency>
</dependency>
</dependencies>
</dependencies>
<configuration>
<configuration>
...
@@ -283,6 +282,16 @@
...
@@ -283,6 +282,16 @@
</dependency>
</dependency>
</dependencies>
</dependencies>
</plugin>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-assembly-plugin
</artifactId>
<version>
2.6
</version>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-release-plugin
</artifactId>
<version>
2.5.3
</version>
</plugin>
</plugins>
</plugins>
</pluginManagement>
</pluginManagement>
<plugins>
<plugins>
...
@@ -294,6 +303,22 @@
...
@@ -294,6 +303,22 @@
<groupId>
org.codehaus.mojo
</groupId>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
findbugs-maven-plugin
</artifactId>
<artifactId>
findbugs-maven-plugin
</artifactId>
</plugin>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-release-plugin
</artifactId>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-jar-plugin
</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>
true
</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>
true
</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</plugins>
</build>
</build>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录