Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeb Ford-Reitz2011-04-18 08:16:13 -0400
committerZeb Ford-Reitz2011-04-18 08:16:13 -0400
commitfcc9b1b55370ac1d463e2f35a4e37ac497cfc2c8 (patch)
tree815374c7b7d4fd16f4167bc8347467013036ff96
parent48305094873a6a186e4eb10c2caa3a935c82320c (diff)
parent8f4e4047f09cff46f7d670f9ae89ae5f10205faa (diff)
downloadorg.eclipse.jubula.core-fcc9b1b55370ac1d463e2f35a4e37ac497cfc2c8.tar.gz
org.eclipse.jubula.core-fcc9b1b55370ac1d463e2f35a4e37ac497cfc2c8.tar.xz
org.eclipse.jubula.core-fcc9b1b55370ac1d463e2f35a4e37ac497cfc2c8.zip
Merge branch 'master' of ssh://gatekeeper.bredex.de:2405/gitroot/jubula/org.eclipse.jubula.core
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java12
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/IVersion.java2
3 files changed, 11 insertions, 10 deletions
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java
index 1a6eef3c5..ef3856767 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java
@@ -71,6 +71,7 @@ public class MonitoringValuePO extends MonitoringValue {
* @return the value
*/
@Basic
+ @Column(name = "MON_VALUE")
public String getValue() {
return super.getValue();
}
@@ -79,6 +80,7 @@ public class MonitoringValuePO extends MonitoringValue {
* @return the type
*/
@Basic
+ @Column(name = "MON_TYPE")
public String getType() {
return super.getType();
}
@@ -87,6 +89,7 @@ public class MonitoringValuePO extends MonitoringValue {
* {@inheritDoc}
*/
@Basic
+ @Column(name = "MON_CATEGORY")
public String getCategory() {
return super.getCategory();
}
@@ -101,7 +104,6 @@ public class MonitoringValuePO extends MonitoringValue {
/**
* @param value the value to set
*/
-
public void setValue(String value) {
super.setValue(value);
}
@@ -116,7 +118,6 @@ public class MonitoringValuePO extends MonitoringValue {
/**
* {@inheritDoc}
*/
-
public void setSignificant(Boolean significant) {
super.setSignificant(significant);
@@ -126,7 +127,7 @@ public class MonitoringValuePO extends MonitoringValue {
* {@inheritDoc}
*/
@Basic
- @Column(name = "isSignificant")
+ @Column(name = "IS_SIGNIFICANT")
public Boolean isSignificant() {
return super.isSignificant();
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java
index c07dbf6ae..c95b2571d 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java
@@ -244,7 +244,7 @@ class TestResultSummaryPO implements ITestResultSummaryPO {
* @return the testJobGuid
*/
@Basic
- @Column(name = "INTERNAL_TEST_JOB_GUID", length = 4000)
+ @Column(name = "INTERNAL_TEST_JOB_GUID", length = 32)
public String getInternalTestJobGuid() {
return m_testJobGuid;
}
@@ -349,7 +349,7 @@ class TestResultSummaryPO implements ITestResultSummaryPO {
* @return the projectGuid
*/
@Basic
- @Column(name = "INTERNAL_PROJECT_GUID", length = 4000)
+ @Column(name = "INTERNAL_PROJECT_GUID", length = 32)
public String getInternalProjectGuid() {
return m_projectGuid;
}
@@ -381,7 +381,7 @@ class TestResultSummaryPO implements ITestResultSummaryPO {
* @return the tsGuid
*/
@Basic
- @Column(name = "INTERNAL_TESTSUITE_GUID", length = 4000)
+ @Column(name = "INTERNAL_TESTSUITE_GUID", length = 32)
public String getInternalTestsuiteGuid() {
return m_testsuiteGuid;
}
@@ -439,7 +439,7 @@ class TestResultSummaryPO implements ITestResultSummaryPO {
* @return Returns the autGuid.
*/
@Basic
- @Column(name = "INTERNAL_AUT_GUID", length = 4000)
+ @Column(name = "INTERNAL_AUT_GUID", length = 32)
public String getInternalAutGuid() {
return m_autGuid;
}
@@ -479,7 +479,7 @@ class TestResultSummaryPO implements ITestResultSummaryPO {
* @return the autConfGuid
*/
@Basic
- @Column(name = "INTERNAL_AUT_CONFIG_GUID", length = 4000)
+ @Column(name = "INTERNAL_AUT_CONFIG_GUID", length = 32)
public String getInternalAutConfigGuid() {
return m_autConfigGuid;
}
@@ -924,7 +924,7 @@ class TestResultSummaryPO implements ITestResultSummaryPO {
*/
@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "MONITORING_VALUE")
- @MapKeyColumn(name = "KEY")
+ @MapKeyColumn(name = "MON_KEY")
private Map<String, MonitoringValuePO> getHbmMonitoringValues() {
return m_monitoringValues;
}
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/IVersion.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/IVersion.java
index 55916499d..01d8c6d76 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/IVersion.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/IVersion.java
@@ -24,7 +24,7 @@ public interface IVersion {
public final Integer JB_PROTOCOL_MAJOR_VERSION = new Integer(10);
/** major version for DB */
- public final Integer JB_DB_MAJOR_VERSION = new Integer(33);
+ public final Integer JB_DB_MAJOR_VERSION = new Integer(34);
/** minor version for DB */
public final Integer GD_DB_MINOR_VERSION = new Integer(0);

Back to the top