summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-22 02:02:42 (EST)
committer Winston Prakash2011-12-01 20:46:53 (EST)
commit421f871094f5827e419f6bc240c81e6c94e72336 (patch)
treebe80af8e31137be8616e8dfa650bf6f730e3d460
parent21995aa3e7cfaf9571d99c347da071227457bb25 (diff)
downloadorg.eclipse.hudson.core-421f871094f5827e419f6bc240c81e6c94e72336.zip
org.eclipse.hudson.core-421f871094f5827e419f6bc240c81e6c94e72336.tar.gz
org.eclipse.hudson.core-421f871094f5827e419f6bc240c81e6c94e72336.tar.bz2
"Update licenses. Rename isTemplateValue=>isCascadingValue. Fixed cobertura configuration
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/pom.xml10
-rw-r--r--hudson-core/src/main/java/hudson/model/Job.java2
-rw-r--r--hudson-core/src/main/resources/lib/form/optionalBlock.jelly14
-rw-r--r--hudson-core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly4
-rw-r--r--hudson-core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly4
-rw-r--r--hudson-core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly4
6 files changed, 17 insertions, 21 deletions
diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml
index 37679e1..3596aec 100644
--- a/hudson-core/pom.xml
+++ b/hudson-core/pom.xml
@@ -76,6 +76,7 @@
<bridge-method-injector.version>1.4</bridge-method-injector.version>
<access-modifier-checker.version>1.0</access-modifier-checker.version>
<antlr-maven-plugin.version>2.1</antlr-maven-plugin.version>
+ <cobertura-maven-plugin.version>2.5.1</cobertura-maven-plugin.version>
<apt-maven-plugin.version>1.0-alpha-2</apt-maven-plugin.version>
<maven-project-info-reports-plugin.version>2.1</maven-project-info-reports-plugin.version>
</properties>
@@ -307,19 +308,14 @@
</profile>
<profile>
- <id>CI</id>
- <activation>
- <property>
- <name>BUILD_NUMBER</name>
- </property>
- </activation>
+ <id>hudson</id>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>${cobertura-maven-plugin.version}</version>
<configuration>
<check>
<branchRate>80</branchRate>
diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java
index 387cc85..7568d66 100644
--- a/hudson-core/src/main/java/hudson/model/Job.java
+++ b/hudson-core/src/main/java/hudson/model/Job.java
@@ -1275,7 +1275,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
* Checks whether current job is inherited from other project.
* @return boolean.
*/
- protected boolean hasCascadingProject() {
+ public boolean hasCascadingProject() {
return null != getCascadingProject();
}
diff --git a/hudson-core/src/main/resources/lib/form/optionalBlock.jelly b/hudson-core/src/main/resources/lib/form/optionalBlock.jelly
index 9b3cefc..f978dc2 100644
--- a/hudson-core/src/main/resources/lib/form/optionalBlock.jelly
+++ b/hudson-core/src/main/resources/lib/form/optionalBlock.jelly
@@ -1,6 +1,6 @@
<!-- **************************************************************************
#
-# Copyright (c) 2004-2009 Oracle Corporation.
+# Copyright (c) 2004-2011 Oracle Corporation.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
#
# Contributors:
#
-# Kohsuke Kawaguchi
+# Kohsuke Kawaguchi, Nikita Levyankov, Anton Kozak
#
#
#************************************************************************** -->
@@ -44,8 +44,8 @@
<st:attribute name="inline">
if present, the foldable section will not be grouped into a separate JSON object upon submission
</st:attribute>
- <st:attribute name="isTemplateValue">
- if present and true - value is taken from parent template
+ <st:attribute name="isCascadingValue">
+ if present and true - value is taken from cascading parent
</st:attribute>
</st:documentation>
<j:if test="${attrs.help==null}">
@@ -53,12 +53,12 @@
<j:set target="${attrs}" property="help"
value="${descriptor.getHelpFile(attrs.field)}" />
</j:if>
- <j:if test="${attrs.isTemplateValue==null}">
- <j:set target="${attrs}" property="isTemplateValue" value="false"/>
+ <j:if test="${attrs.isCascadingValue==null}">
+ <j:set target="${attrs}" property="isCascadingValue" value="false"/>
</j:if>
<tr class="optional-block-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
- <td colspan="3" class="${attrs.isTemplateValue? 'modified': 'original'}">
+ <td colspan="3" class="${attrs.isCascadingValue? 'modified': 'original'}">
<f:checkbox name="${attrs.name}" onclick="javascript:updateOptionalBlock(this,true)"
negative="${attrs.negative}" checked="${attrs.checked}" field="${attrs.field}" title="${title}" />
</td>
diff --git a/hudson-core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly b/hudson-core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly
index de2a7e9..6364734 100644
--- a/hudson-core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly
+++ b/hudson-core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly
@@ -9,7 +9,7 @@
#
# Contributors:
#
-# Shinod
+# Shinod, Nikita Levyankov, Anton Kozak
#
#
#************************************************************************** -->
@@ -21,5 +21,5 @@
title="${%Block build when downstream project is building}"
help="/help/project-config/block-downstream-building.html"
checked="${it.blockBuildWhenDownstreamBuilding()}"
- isTemplateValue="${it.hasParentTemplate() and null != it.blockBuildWhenDownstreamBuilding(false)}"/>
+ isCascadingValue="${it.hasCascadingProject() and null != it.blockBuildWhenDownstreamBuilding(false)}"/>
</j:jelly>
diff --git a/hudson-core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly b/hudson-core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly
index dea9128..0ca36a6 100644
--- a/hudson-core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly
+++ b/hudson-core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly
@@ -9,7 +9,7 @@
#
# Contributors:
#
-# Shinod
+# Shinod, Nikita Levyankov, Anton Kozak
#
#
#************************************************************************** -->
@@ -21,5 +21,5 @@
title="${%Block build when upstream project is building}"
help="/help/project-config/block-upstream-building.html"
checked="${it.blockBuildWhenUpstreamBuilding()}"
- isTemplateValue="${it.hasParentTemplate() and null != it.blockBuildWhenUpstreamBuilding(false)}"/>
+ isCascadingValue="${it.hasCascadingProject() and null != it.blockBuildWhenUpstreamBuilding(false)}"/>
</j:jelly>
diff --git a/hudson-core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly b/hudson-core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly
index b34d56b..5b1a257 100644
--- a/hudson-core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly
+++ b/hudson-core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly
@@ -9,7 +9,7 @@
#
# Contributors:
#
-# Knute G. Axelson
+# Knute G. Axelson, Nikita Levyankov, Anton Kozak
#
#
#************************************************************************** -->
@@ -19,6 +19,6 @@
<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">
<f:optionalBlock name="cleanWorkspaceRequired" title="${%Clean workspace before build}"
checked="${it.cleanWorkspaceRequired}"
- isTemplateValue="${it.hasParentTemplate() and null != it.isCleanWorkspaceRequired(false)}"
+ isCascadingValue="${it.hasCascadingProject() and null != it.isCleanWorkspaceRequired(false)}"
help="/help/project-config/cleanWorkspace.html" />
</j:jelly>