Diff
Modified: trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/dtkit-metrics-hudson-api.iml (40735 => 40736)
--- trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/dtkit-metrics-hudson-api.iml 2012-10-27 21:16:36 UTC (rev 40735)
+++ trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/dtkit-metrics-hudson-api.iml 2012-10-27 21:22:16 UTC (rev 40736)
@@ -12,7 +12,6 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
<output url="" />
<output-test url="" />
- <exclude-output />
<content url=""
<sourceFolder url="" isTestSource="false" />
<excludeFolder url="" />
Modified: trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/CoverageType.java (40735 => 40736)
--- trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/CoverageType.java 2012-10-27 21:16:36 UTC (rev 40735)
+++ trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/CoverageType.java 2012-10-27 21:22:16 UTC (rev 40736)
@@ -33,12 +33,12 @@
@SuppressWarnings("unused")
public abstract class CoverageType extends MetricsType implements Describable<CoverageType> {
- protected CoverageType(String pattern, boolean failureIfNotNew, boolean deleteOutputFiles, boolean stopProcessingIfError) {
- super(pattern, failureIfNotNew, deleteOutputFiles, stopProcessingIfError);
+ protected CoverageType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles, boolean stopProcessingIfError) {
+ super(pattern, failIfNotNew, deleteOutputFiles, stopProcessingIfError);
}
- protected CoverageType(String pattern, boolean failureIfNotNew, boolean deleteOutputFiles) {
- super(pattern, failureIfNotNew, deleteOutputFiles);
+ protected CoverageType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles) {
+ super(pattern, failIfNotNew, deleteOutputFiles);
}
protected CoverageType(String pattern) {
Modified: trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/MeasureType.java (40735 => 40736)
--- trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/MeasureType.java 2012-10-27 21:16:36 UTC (rev 40735)
+++ trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/MeasureType.java 2012-10-27 21:22:16 UTC (rev 40736)
@@ -32,12 +32,12 @@
@SuppressWarnings("unused")
public abstract class MeasureType extends MetricsType implements Describable<MeasureType> {
- protected MeasureType(String pattern, boolean failureIfNotNew, boolean deleteOutputFiles, boolean stopProcessingIfError) {
- super(pattern, failureIfNotNew, deleteOutputFiles, stopProcessingIfError);
+ protected MeasureType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles, boolean stopProcessingIfError) {
+ super(pattern, failIfNotNew, deleteOutputFiles, stopProcessingIfError);
}
- protected MeasureType(String pattern, boolean failureIfNotNew, boolean deleteOutputFiles) {
- super(pattern, failureIfNotNew, deleteOutputFiles);
+ protected MeasureType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles) {
+ super(pattern, failIfNotNew, deleteOutputFiles);
}
protected MeasureType(String pattern) {
Modified: trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/MetricsType.java (40735 => 40736)
--- trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/MetricsType.java 2012-10-27 21:16:36 UTC (rev 40735)
+++ trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/MetricsType.java 2012-10-27 21:22:16 UTC (rev 40736)
@@ -33,29 +33,31 @@
private final String pattern;
- private final Boolean faildedIfNotNew;
+ private transient Boolean faildedIfNotNew;
- private final Boolean deleteOutputFiles;
+ private Boolean failIfNotNew;
+ private Boolean deleteOutputFiles;
+
private Boolean stopProcessingIfError;
- protected MetricsType(String pattern, Boolean faildedIfNotNew, Boolean deleteOutputFiles, Boolean stopProcessingIfError) {
+ protected MetricsType(String pattern, Boolean failIfNotNew, Boolean deleteOutputFiles, Boolean stopProcessingIfError) {
this.pattern = pattern;
- this.faildedIfNotNew = faildedIfNotNew;
+ this.failIfNotNew = failIfNotNew;
this.deleteOutputFiles = deleteOutputFiles;
this.stopProcessingIfError = stopProcessingIfError;
}
- protected MetricsType(String pattern, boolean faildedIfNotNew, boolean deleteOutputFiles) {
+ protected MetricsType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles) {
this.pattern = pattern;
- this.faildedIfNotNew = faildedIfNotNew;
+ this.failIfNotNew = failIfNotNew;
this.deleteOutputFiles = deleteOutputFiles;
this.stopProcessingIfError = true;
}
protected MetricsType(String pattern) {
this.pattern = pattern;
- this.faildedIfNotNew = false;
+ this.failIfNotNew = false;
this.deleteOutputFiles = false;
this.stopProcessingIfError = true;
}
@@ -66,6 +68,12 @@
}
@SuppressWarnings("unused")
+ public boolean isFailIfNotNew() {
+ return (failIfNotNew == null ? true : failIfNotNew);
+ }
+
+ @SuppressWarnings("unused")
+ @Deprecated
public boolean isFaildedIfNotNew() {
return (faildedIfNotNew == null ? true : faildedIfNotNew);
}
@@ -84,10 +92,17 @@
public abstract InputMetric getInputMetric();
+ @SuppressWarnings("unused")
public Object readResolve() {
- if (stopProcessingIfError == null){
+
+ if (stopProcessingIfError == null) {
stopProcessingIfError = true;
}
+
+ if (failIfNotNew == null) {
+ failIfNotNew = (faildedIfNotNew == null) ? false : faildedIfNotNew.booleanValue();
+ }
+
return this;
}
}
Modified: trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/TestType.java (40735 => 40736)
--- trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/TestType.java 2012-10-27 21:16:36 UTC (rev 40735)
+++ trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/TestType.java 2012-10-27 21:22:16 UTC (rev 40736)
@@ -32,12 +32,12 @@
@SuppressWarnings("unused")
public abstract class TestType extends MetricsType implements Describable<TestType> {
- protected TestType(String pattern, boolean failureIfNotNew, boolean deleteOutputFiles, boolean stopProcessingIfError) {
- super(pattern, failureIfNotNew, deleteOutputFiles, stopProcessingIfError);
+ protected TestType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles, boolean stopProcessingIfError) {
+ super(pattern, failIfNotNew, deleteOutputFiles, stopProcessingIfError);
}
- protected TestType(String pattern, boolean failureIfNotNew, boolean deleteOutputFiles) {
- super(pattern, failureIfNotNew, deleteOutputFiles);
+ protected TestType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles) {
+ super(pattern, failIfNotNew, deleteOutputFiles);
}
protected TestType(String pattern) {
Modified: trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/ViolationsType.java (40735 => 40736)
--- trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/ViolationsType.java 2012-10-27 21:16:36 UTC (rev 40735)
+++ trunk/hudson/dtkit/dtkit-frmk/dtkit-metrics-hudson-api/src/main/java/com/thalesgroup/dtkit/metrics/hudson/api/type/ViolationsType.java 2012-10-27 21:22:16 UTC (rev 40736)
@@ -32,12 +32,12 @@
@SuppressWarnings("unused")
public abstract class ViolationsType extends MetricsType implements Describable<ViolationsType> {
- protected ViolationsType(String pattern, boolean failureIfNotNew, boolean deleteOutputFiles, boolean stopProcessingIfError) {
- super(pattern, failureIfNotNew, deleteOutputFiles, stopProcessingIfError);
+ protected ViolationsType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles, boolean stopProcessingIfError) {
+ super(pattern, failIfNotNew, deleteOutputFiles, stopProcessingIfError);
}
- protected ViolationsType(String pattern, boolean failureIfNotNew, boolean deleteOutputFiles) {
- super(pattern, failureIfNotNew, deleteOutputFiles);
+ protected ViolationsType(String pattern, boolean failIfNotNew, boolean deleteOutputFiles) {
+ super(pattern, failIfNotNew, deleteOutputFiles);
}
protected ViolationsType(String pattern) {
Modified: trunk/hudson/dtkit/dtkit-frmk/pom.xml (40735 => 40736)
--- trunk/hudson/dtkit/dtkit-frmk/pom.xml 2012-10-27 21:16:36 UTC (rev 40735)
+++ trunk/hudson/dtkit/dtkit-frmk/pom.xml 2012-10-27 21:22:16 UTC (rev 40736)
@@ -2,9 +2,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.thalesgroup.dtkit</groupId>
+ <groupId>org.jenkins-ci.lib.dtkit</groupId>
<artifactId>dtkit-metrics-parent</artifactId>
- <version>9</version>
+ <version>10</version>
</parent>
<groupId>org.jenkins-ci.lib.dtkit</groupId>
@@ -23,9 +23,8 @@
<developers>
<developer>
- <id>gbois</id>
+ <id>gboissinot</id>
<name>Gregory Boissinot</name>
- <email>gb...@dev.java.net</email>
<timezone>+1</timezone>
<roles>
<role>Project owner</role>
@@ -59,7 +58,6 @@
<connection>scm:svn:https://svn.jenkins-ci.org/trunk/hudson/dtkit/dtkit-frmk</connection>
<developerConnection>scm:svn:https://svn.jenkins-ci.org/trunk/hudson/dtkit/dtkit-frmk
</developerConnection>
- <url>https://github.com/jenkinsci/pom/dtkit-metrics-parent/tags/dtkit-metrics-parent-9/dtkit-frmk</url>
</scm>
</project>
