Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dream21st
jenkins
提交
0e79d59a
J
jenkins
项目概览
dream21st
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
0e79d59a
编写于
9月 23, 2012
作者:
I
imod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use drop down selector to save space in the UI
TODO: remove old selectors
上级
d98b2d0f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
20 deletion
+25
-20
core/src/main/java/hudson/mvn/GlobalSettingsProvider.java
core/src/main/java/hudson/mvn/GlobalSettingsProvider.java
+6
-4
core/src/main/java/hudson/mvn/SettingsProvider.java
core/src/main/java/hudson/mvn/SettingsProvider.java
+6
-4
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
...urces/hudson/maven/MavenModuleSet/configure-entries.jelly
+13
-12
未找到文件。
core/src/main/java/hudson/mvn/GlobalSettingsProvider.java
浏览文件 @
0e79d59a
...
...
@@ -10,6 +10,8 @@ import java.io.IOException;
import
javax.servlet.ServletException
;
import
net.sf.json.JSONObject
;
import
org.kohsuke.stapler.StaplerRequest
;
/**
...
...
@@ -23,14 +25,14 @@ public abstract class GlobalSettingsProvider extends AbstractDescribableImpl<Glo
* @param margs
* @param project
*/
public
abstract
void
configure
(
ArgumentListBuilder
margs
,
AbstractBuild
project
)
throws
IOException
,
InterruptedException
;
public
abstract
void
configure
(
ArgumentListBuilder
margs
,
AbstractBuild
<?,
?>
project
)
throws
IOException
,
InterruptedException
;
public
static
GlobalSettingsProvider
parseSettingsProvider
(
StaplerRequest
req
)
throws
Descriptor
.
FormException
,
ServletException
{
String
scm
=
req
.
getParameter
(
"globalSettings"
);
if
(
s
cm
==
null
)
{
JSONObject
settings
=
req
.
getSubmittedForm
().
getJSONObject
(
"globalSettings"
);
if
(
s
ettings
==
null
)
{
return
new
DefaultGlobalSettingsProvider
();
}
return
req
.
bindJSON
(
GlobalSettingsProvider
.
class
,
req
.
getSubmittedForm
().
getJSONObject
(
"globalSettings"
)
);
return
req
.
bindJSON
(
GlobalSettingsProvider
.
class
,
settings
);
}
}
...
...
core/src/main/java/hudson/mvn/SettingsProvider.java
浏览文件 @
0e79d59a
...
...
@@ -10,6 +10,8 @@ import java.io.IOException;
import
javax.servlet.ServletException
;
import
net.sf.json.JSONObject
;
import
org.kohsuke.stapler.StaplerRequest
;
/**
...
...
@@ -23,14 +25,14 @@ public abstract class SettingsProvider extends AbstractDescribableImpl<SettingsP
* @param margs
* @param project
*/
public
abstract
void
configure
(
ArgumentListBuilder
margs
,
AbstractBuild
project
)
throws
IOException
,
InterruptedException
;
public
abstract
void
configure
(
ArgumentListBuilder
margs
,
AbstractBuild
<?,
?>
project
)
throws
IOException
,
InterruptedException
;
public
static
SettingsProvider
parseSettingsProvider
(
StaplerRequest
req
)
throws
Descriptor
.
FormException
,
ServletException
{
String
scm
=
req
.
getParameter
(
"settings"
);
if
(
s
cm
==
null
)
{
JSONObject
settings
=
req
.
getSubmittedForm
().
getJSONObject
(
"settings"
);
if
(
s
ettings
==
null
)
{
return
new
DefaultSettingsProvider
();
}
return
req
.
bindJSON
(
SettingsProvider
.
class
,
req
.
getSubmittedForm
().
getJSONObject
(
"settings"
)
);
return
req
.
bindJSON
(
SettingsProvider
.
class
,
settings
);
}
}
...
...
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
浏览文件 @
0e79d59a
...
...
@@ -79,16 +79,7 @@ THE SOFTWARE.
<f:entry title="MAVEN_OPTS" help="/plugin/maven-plugin/maven-opts.html">
<f:expandableTextbox name="mavenOpts" value="${it.mavenOpts}" />
</f:entry>
<f:entry title="${%Settings file}">
<f:hetero-radio field="settings" descriptors="${descriptor.settingsProviders}"/>
</f:entry>
<f:entry title="${%Global Settings file}">
<f:hetero-radio field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
</f:entry>
<f:optionalBlock name="maven.incrementalBuild"
title="${%Incremental build - only build changed modules}"
help="/plugin/maven-plugin/incremental.html"
...
...
@@ -122,8 +113,9 @@ THE SOFTWARE.
</select>
</f:entry>
<!-- TODO remove after refactor start -->
<j:set var="mavenSettingsConfigs" value="${it.allMavenSettingsConfigs}" />
<f:entry title="${%Maven Settings Configs}">
<f:entry title="
REMOVE -
${%Maven Settings Configs}">
<select class="setting-input" name="maven.mavenSettingsConfigId">
<f:option value="">- select -</f:option>
<j:forEach var="settingConfig" items="${mavenSettingsConfigs}">
...
...
@@ -133,7 +125,7 @@ THE SOFTWARE.
</f:entry>
<j:set var="mavenGlobalSettingsConfigs" value="${it.allGlobalMavenSettingsConfigs}" />
<f:entry title="${%Maven Global Settings Configs}">
<f:entry title="
REMOVE -
${%Maven Global Settings Configs}">
<select class="setting-input" name="maven.mavenGlobalSettingConfigId">
<f:option value="">- select -</f:option>
<j:forEach var="globalSettingConfig" items="${mavenGlobalSettingsConfigs}">
...
...
@@ -141,6 +133,15 @@ THE SOFTWARE.
</j:forEach>
</select>
</f:entry>
<!-- TODO remove ende -->
<f:entry title="${%Settings file}">
<f:dropdownDescriptorSelector field="settings" descriptors="${descriptor.settingsProviders}"/>
</f:entry>
<f:entry title="${%Global Settings file}">
<f:dropdownDescriptorSelector field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
</f:entry>
</f:advanced>
</f:section>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录