Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
2ead8ee5
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2ead8ee5
编写于
7月 25, 2012
作者:
N
Nicolas De Loof
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:jenkinsci/jenkins
上级
45a38867
86f25b0d
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
112 addition
and
21 deletion
+112
-21
changelog.html
changelog.html
+5
-0
core/pom.xml
core/pom.xml
+0
-1
core/src/main/java/hudson/cli/BuildCommand.java
core/src/main/java/hudson/cli/BuildCommand.java
+8
-0
core/src/main/resources/hudson/tools/ToolInstallation/global.jelly
...main/resources/hudson/tools/ToolInstallation/global.jelly
+39
-15
osx/JenkinsInstaller.pmdoc/03jenkins-contents.xml
osx/JenkinsInstaller.pmdoc/03jenkins-contents.xml
+9
-1
osx/JenkinsInstaller.pmdoc/03jenkins.xml
osx/JenkinsInstaller.pmdoc/03jenkins.xml
+30
-1
osx/Library/Application Support/Jenkins/Uninstall.command
osx/Library/Application Support/Jenkins/Uninstall.command
+19
-0
pom.xml
pom.xml
+1
-0
test/src/main/java/org/jvnet/hudson/test/JenkinsMatchers.java
.../src/main/java/org/jvnet/hudson/test/JenkinsMatchers.java
+0
-2
test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
+1
-1
未找到文件。
changelog.html
浏览文件 @
2ead8ee5
...
...
@@ -55,6 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
rfe
>
Collapse nonempty tool installation sections by default in
<code>
/configure
</code>
.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-14538"
>
issue 14538
</a>
)
<li
class=
bug
>
Custom workspace in matrix projects should be able to use axis as variables.
<li
class=
bug
>
...
...
@@ -64,6 +67,8 @@ Upcoming changes</a>
Make the draggable component more obvious by providing a border.
<li
class=
rfe
>
Added REST API for view manipulation
<li
class=
"rfe"
>
OS X installer now has an Uninstall tool (in /Library/Application Support/Jenkins).
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/pom.xml
浏览文件 @
2ead8ee5
...
...
@@ -43,7 +43,6 @@ THE SOFTWARE.
<properties>
<staplerFork>
true
</staplerFork>
<stapler.version>
1.192
</stapler.version>
<netbeans.compile.on.save>
none
</netbeans.compile.on.save>
<!-- we rely on Maven source generation -->
</properties>
<dependencies>
...
...
core/src/main/java/hudson/cli/BuildCommand.java
浏览文件 @
2ead8ee5
...
...
@@ -32,7 +32,9 @@ import hudson.model.ParametersDefinitionProperty;
import
hudson.model.ParameterDefinition
;
import
hudson.Extension
;
import
hudson.AbortException
;
import
hudson.console.ModelHyperlinkNote
;
import
hudson.model.Item
;
import
hudson.model.TaskListener
;
import
hudson.model.queue.QueueTaskFuture
;
import
hudson.scm.PollingResult.Change
;
import
hudson.util.EditDistance
;
...
...
@@ -158,6 +160,12 @@ public class BuildCommand extends CLICommand {
return
"Started by command line by "
+
startedBy
;
}
@Override
public
void
print
(
TaskListener
listener
)
{
listener
.
getLogger
().
println
(
"Started by command line by "
+
ModelHyperlinkNote
.
encodeTo
(
"/user/"
+
getUserId
(),
getUserName
()));
}
@Override
public
boolean
equals
(
Object
o
)
{
return
o
instanceof
CLICause
;
...
...
core/src/main/resources/hudson/tools/ToolInstallation/global.jelly
浏览文件 @
2ead8ee5
...
...
@@ -22,8 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
xmlns:local="local"
>
<f:section title="${descriptor.displayName}">
<d:taglib uri="local">
<d:tag name="section">
<f:entry title="${%title(descriptor.displayName)}" description="${%description(descriptor.displayName)}">
<f:repeatable name="tool" var="instance" items="${descriptor.installations}"
add="${%label.add(descriptor.displayName)}" header="${descriptor.displayName}">
...
...
@@ -39,5 +41,27 @@ THE SOFTWARE.
</table>
</f:repeatable>
</f:entry>
</d:tag>
</d:taglib>
<j:choose>
<j:when test="${size(descriptor.installations)==0}">
<local:section/>
</j:when>
<j:otherwise>
<tr> <!-- f:advanced does not work well here because of placement in third column -->
<td colspan="3">
<st:adjunct includes="lib.form.advanced.advanced"/>
<div class="advancedLink" style="text-align:left">
<input type="button" value="${%title(descriptor.displayName)}..." class="advanced-button advancedButton"/>
</div>
<table class="advancedBody">
<tbody>
<local:section/>
</tbody>
</table>
</td>
</tr>
</j:otherwise>
</j:choose>
</f:section>
</j:jelly>
osx/JenkinsInstaller.pmdoc/03jenkins-contents.xml
浏览文件 @
2ead8ee5
<pkg-contents
spec=
"1.12"
><f
n=
"Jenkins"
o=
"root"
g=
"admin"
p=
"16893"
pt=
"/Users/sami/Documents/Projektit/jenkins/osx/Library/Application Support/Jenkins"
m=
"true"
t=
"file"
><f
n=
"jenkins-runner.sh"
o=
"root"
g=
"admin"
p=
"33277"
/><mod>
group
</mod><mod>
owner
</mod></f></pkg-contents>
\ No newline at end of file
<?xml version="1.0"?>
<pkg-contents
spec=
"1.12"
>
<f
n=
"Jenkins"
o=
"root"
g=
"admin"
p=
"16893"
pt=
"/Users/sami/Documents/Projektit/jenkins/osx/Library/Application Support/Jenkins"
m=
"true"
t=
"file"
>
<f
n=
"jenkins-runner.sh"
o=
"root"
g=
"admin"
p=
"33277"
/>
<f
n=
"Uninstall.command"
o=
"root"
g=
"admin"
p=
"33277"
/>
<mod>
group
</mod>
<mod>
owner
</mod>
</f>
</pkg-contents>
osx/JenkinsInstaller.pmdoc/03jenkins.xml
浏览文件 @
2ead8ee5
<pkgref
spec=
"1.12"
uuid=
"F25C6AE3-4642-492B-B4BD-013F42D4777B"
><config><identifier>
org.jenkins-ci.support.pkg
</identifier><version>
1.0
</version><description></description><post-install
type=
"none"
/><requireAuthorization/><installFrom
relative=
"true"
includeRoot=
"true"
>
Library/Application Support/Jenkins
</installFrom><installTo
mod=
"true"
>
/Library/Application Support
</installTo><flags><followSymbolicLinks/></flags><packageStore
type=
"internal"
></packageStore><mod>
installTo.path
</mod><mod>
installFrom.isRelativeType
</mod><mod>
identifier
</mod><mod>
includeRoot
</mod><mod>
parent
</mod><mod>
installTo
</mod></config><contents><file-list>
03jenkins-contents.xml
</file-list><filter>
/CVS$
</filter><filter>
/\.svn$
</filter><filter>
/\.cvsignore$
</filter><filter>
/\.cvspass$
</filter><filter>
/\.DS_Store$
</filter></contents></pkgref>
\ No newline at end of file
<?xml version="1.0"?>
<pkgref
spec=
"1.12"
uuid=
"F25C6AE3-4642-492B-B4BD-013F42D4777B"
>
<config>
<identifier>
org.jenkins-ci.support.pkg
</identifier>
<version>
1.0
</version>
<description/>
<post-install
type=
"none"
/>
<requireAuthorization/>
<installFrom
relative=
"true"
includeRoot=
"true"
>
Library/Application Support/Jenkins
</installFrom>
<installTo
mod=
"true"
>
/Library/Application Support
</installTo>
<flags>
<followSymbolicLinks/>
</flags>
<packageStore
type=
"internal"
/>
<mod>
installTo.path
</mod>
<mod>
installFrom.isRelativeType
</mod>
<mod>
identifier
</mod>
<mod>
includeRoot
</mod>
<mod>
parent
</mod>
<mod>
installTo
</mod>
</config>
<contents>
<file-list>
03jenkins-contents.xml
</file-list>
<filter>
/CVS$
</filter>
<filter>
/\.svn$
</filter>
<filter>
/\.cvsignore$
</filter>
<filter>
/\.cvspass$
</filter>
<filter>
/\.DS_Store$
</filter>
</contents>
</pkgref>
osx/Library/Application Support/Jenkins/Uninstall.command
0 → 100755
浏览文件 @
2ead8ee5
#!/bin/bash
echo
echo
echo
"Jenkins uninstallation script"
echo
echo
"The following commands are executed using sudo, so you need to be logged"
echo
"in as an administrator. Please provide your password when prompted."
echo
set
-x
sudo
launchctl unload /Library/LaunchDaemons/org.jenkins-ci.plist
sudo rm
/Library/LaunchDaemons/org.jenkins-ci.plist
sudo rm
-rf
/Applications/Jenkins
"/Library/Application Support/Jenkins"
/Library/Documentation/Jenkins
sudo rm
-rf
/Users/Shared/Jenkins
sudo
dscl
.
-delete
/Users/jenkins
sudo
dscl
.
-delete
/Groups/jenkins
pkgutil
--pkgs
|
grep
'org\.jenkins-ci\.'
| xargs
-n
1
sudo
pkgutil
--forget
set
+x
echo
echo
"Jenkins has been uninstalled."
pom.xml
浏览文件 @
2ead8ee5
...
...
@@ -90,6 +90,7 @@ THE SOFTWARE.
<patch.tracker.serverId>
jenkins-jira
</patch.tracker.serverId>
<slf4jVersion>
1.6.2
</slf4jVersion>
<!-- < 1.6.x version didn't specify the license (MIT) -->
<netbeans.compile.on.save>
none
</netbeans.compile.on.save>
<!-- we rely on Maven source generation -->
</properties>
...
...
test/src/main/java/org/jvnet/hudson/test/JenkinsMatchers.java
浏览文件 @
2ead8ee5
...
...
@@ -10,8 +10,6 @@ import java.lang.reflect.Constructor;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Modifier
;
import
static
org
.
hamcrest
.
Matchers
.
allOf
;
/**
* Some handy matchers.
*
...
...
test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
浏览文件 @
2ead8ee5
...
...
@@ -105,7 +105,7 @@ public class BuildCommandTest extends HudsonTestCase {
def
o
=
new
ByteArrayOutputStream
()
cli
.
execute
([
"build"
,
"-s"
,
"-v"
,
p
.
name
],
System
.
in
,
new
TeeOutputStream
(
System
.
out
,
o
),
System
.
err
)
assertBuildStatusSuccess
(
p
.
getBuildByNumber
(
1
))
assertTrue
(
o
.
toString
().
contains
(
"Started by command line by anonymous"
))
assertTrue
(
o
.
toString
()
,
o
.
toString
()
.
contains
(
"Started by command line by anonymous"
))
assertTrue
(
o
.
toString
().
contains
(
"Finished: SUCCESS"
))
}
finally
{
cli
.
close
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录