Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Mar 31, 2014 · 2042230 · 2042230
2 parents 4c0a0f5 + 32fdab5
commit 2042230
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/config/sql/midpoint/2.3/h2/h2-2.3.sql b/config/sql/midpoint/2.3/h2/h2-2.3.sql
@@ -281,8 +281,8 @@
         validTo timestamp,
         validityChangeTimestamp timestamp,
         validityStatus integer,
-        interationToken varchar(255),
         iteration integer,
+        iterationToken varchar(255),
         id bigint not null,
         oid varchar(36) not null,
         primary key (id, oid)

diff --git a/config/sql/midpoint/2.3/mysql/mysql-2.3.sql b/config/sql/midpoint/2.3/mysql/mysql-2.3.sql
@@ -291,8 +291,8 @@
         validTo DATETIME(6),
         validityChangeTimestamp DATETIME(6),
         validityStatus integer,
-        interationToken varchar(255),
         iteration integer,
+        iterationToken varchar(255),
         id bigint not null,
         oid varchar(36) not null,
         primary key (id, oid)

diff --git a/config/sql/midpoint/2.3/oracle/oracle-2.3.sql b/config/sql/midpoint/2.3/oracle/oracle-2.3.sql
@@ -283,8 +283,8 @@
         validTo timestamp,
         validityChangeTimestamp timestamp,
         validityStatus number(10,0),
-        interationToken varchar2(255 char),
         iteration number(10,0),
+        iterationToken varchar2(255 char),
         id number(19,0) not null,
         oid varchar2(36 char) not null,
         primary key (id, oid)

diff --git a/config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql b/config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
@@ -281,8 +281,8 @@
         validTo timestamp,
         validityChangeTimestamp timestamp,
         validityStatus int4,
-        interationToken varchar(255),
         iteration int4,
+        iterationToken varchar(255),
         id int8 not null,
         oid varchar(36) not null,
         primary key (id, oid)

diff --git a/config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql b/config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
@@ -281,8 +281,8 @@
         validTo datetime2,
         validityChangeTimestamp datetime2,
         validityStatus int,
-        interationToken nvarchar(255),
         iteration int,
+        iterationToken nvarchar(255),
         id bigint not null,
         oid nvarchar(36) not null,
         primary key (id, oid)

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
@@ -60,7 +60,7 @@ public abstract class RFocus<T extends FocusType> extends RObject<T> {
     private Set<RObjectReference> linkRef;
     private Set<RAssignment> assignments;
     private RActivation activation;
-    private String interationToken;
+    private String iterationToken;
     private Integer iteration;
 
     @Where(clause = RObjectReference.REFERENCE_TYPE + "=" + RAccountRef.DISCRIMINATOR)
@@ -113,8 +113,8 @@ public RActivation getActivation() {
         return activation;
     }
 
-    public String getInterationToken() {
-        return interationToken;
+    public String getIterationToken() {
+        return iterationToken;
     }
 
     public Integer getIteration() {
@@ -133,8 +133,8 @@ public void setActivation(RActivation activation) {
         this.activation = activation;
     }
 
-    public void setInterationToken(String interationToken) {
-        this.interationToken = interationToken;
+    public void setIterationToken(String iterationToken) {
+        this.iterationToken = iterationToken;
     }
 
     public void setIteration(Integer iteration) {
@@ -152,7 +152,7 @@ public boolean equals(Object o) {
         if (assignments != null ? !assignments.equals(other.assignments) : other.assignments != null) return false;
         if (linkRef != null ? !linkRef.equals(other.linkRef) : other.linkRef != null) return false;
         if (activation != null ? !activation.equals(other.activation) : other.activation != null) return false;
-        if (interationToken != null ? !interationToken.equals(other.interationToken) : other.interationToken != null) return false;
+        if (iterationToken != null ? !iterationToken.equals(other.iterationToken) : other.iterationToken != null) return false;
         if (iteration != null ? !iteration.equals(other.iteration) : other.iteration != null) return false;
 
         return true;
@@ -162,7 +162,7 @@ public boolean equals(Object o) {
     public int hashCode() {
         int result = super.hashCode();
         result = 31 * result + (activation != null ? activation.hashCode() : 0);
-        result = 31 * result + (interationToken != null ? interationToken.hashCode() : 0);
+        result = 31 * result + (iterationToken != null ? iterationToken.hashCode() : 0);
         result = 31 * result + (iteration != null ? iteration.hashCode() : 0);
 
         return result;
@@ -172,7 +172,7 @@ public static <T extends FocusType> void copyFromJAXB(FocusType jaxb, RFocus<T>
             DtoTranslationException {
         RObject.copyFromJAXB(jaxb, repo, prismContext);
 
-        repo.setInterationToken(jaxb.getIterationToken());
+        repo.setIterationToken(jaxb.getIterationToken());
         repo.setIteration(jaxb.getIteration());
 
         repo.getLinkRef().addAll(
@@ -199,7 +199,7 @@ public static <T extends FocusType> void copyToJAXB(RFocus<T> repo, FocusType ja
         RObject.copyToJAXB(repo, jaxb, prismContext, options);
 
         jaxb.setIteration(repo.getIteration());
-        jaxb.setIterationToken(repo.getInterationToken());
+        jaxb.setIterationToken(repo.getIterationToken());
 
         if (SelectorOptions.hasToLoadPath(FocusType.F_LINK_REF, options)) {
             List linkRefs = RUtil.safeSetReferencesToList(repo.getLinkRef(), prismContext);