You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/06/17 11:40:15 UTC
syncope git commit: [SYNCOPE-862] Verified compatibility with MySQL /
MariaDB / PostgreSQL / Oracle DB / MS SQL Server (changed to use jTDi)
Repository: syncope
Updated Branches:
refs/heads/master b1626cf0d -> bd1f28f84
[SYNCOPE-862] Verified compatibility with MySQL / MariaDB / PostgreSQL / Oracle DB / MS SQL Server (changed to use jTDi)
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bd1f28f8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bd1f28f8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bd1f28f8
Branch: refs/heads/master
Commit: bd1f28f84b300da7f7d62b67431b9163145cf072
Parents: b1626cf
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Jun 17 13:40:06 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Jun 17 13:40:06 2016 +0200
----------------------------------------------------------------------
.../jpa/entity/anyobject/JPAAPlainAttr.java | 4 +---
.../persistence/jpa/entity/group/JPAGPlainAttr.java | 4 +---
.../persistence/jpa/entity/user/JPAUPlainAttr.java | 4 +---
fit/core-reference/pom.xml | 14 +++++++-------
.../resources/sqlserver/domains/Master.properties | 4 ++--
.../org/apache/syncope/fit/core/PullTaskITCase.java | 2 +-
6 files changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd1f28f8/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAPlainAttr.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAPlainAttr.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAPlainAttr.java
index 044faae..fd97268 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAPlainAttr.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAPlainAttr.java
@@ -27,7 +27,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
import javax.validation.Valid;
import org.apache.syncope.core.persistence.api.entity.PlainAttrUniqueValue;
import org.apache.syncope.core.persistence.api.entity.PlainAttrValue;
@@ -39,8 +38,7 @@ import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
import org.apache.syncope.core.persistence.jpa.entity.AbstractPlainAttr;
@Entity
-@Table(name = JPAAPlainAttr.TABLE, uniqueConstraints =
- @UniqueConstraint(columnNames = { "owner_id", "membership_id", "schema_id" }))
+@Table(name = JPAAPlainAttr.TABLE)
public class JPAAPlainAttr extends AbstractPlainAttr<AnyObject> implements APlainAttr {
private static final long serialVersionUID = 8066058729580952116L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd1f28f8/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/group/JPAGPlainAttr.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/group/JPAGPlainAttr.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/group/JPAGPlainAttr.java
index 53cf335..644fa27 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/group/JPAGPlainAttr.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/group/JPAGPlainAttr.java
@@ -27,7 +27,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
import javax.validation.Valid;
import org.apache.syncope.core.persistence.api.entity.PlainAttrUniqueValue;
import org.apache.syncope.core.persistence.api.entity.PlainAttrValue;
@@ -38,8 +37,7 @@ import org.apache.syncope.core.persistence.api.entity.group.Group;
import org.apache.syncope.core.persistence.jpa.entity.AbstractPlainAttr;
@Entity
-@Table(name = JPAGPlainAttr.TABLE, uniqueConstraints =
- @UniqueConstraint(columnNames = { "owner_id", "schema_id" }))
+@Table(name = JPAGPlainAttr.TABLE)
public class JPAGPlainAttr extends AbstractPlainAttr<Group> implements GPlainAttr {
private static final long serialVersionUID = 2848159565890995780L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd1f28f8/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUPlainAttr.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUPlainAttr.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUPlainAttr.java
index bdabf2c..1ae2aa6 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUPlainAttr.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUPlainAttr.java
@@ -27,7 +27,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
import javax.validation.Valid;
import org.apache.syncope.core.persistence.api.entity.PlainAttrUniqueValue;
import org.apache.syncope.core.persistence.api.entity.PlainAttrValue;
@@ -39,8 +38,7 @@ import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.persistence.jpa.entity.AbstractPlainAttr;
@Entity
-@Table(name = JPAUPlainAttr.TABLE, uniqueConstraints =
- @UniqueConstraint(columnNames = { "owner_id", "membership_id", "schema_id" }))
+@Table(name = JPAUPlainAttr.TABLE)
public class JPAUPlainAttr extends AbstractPlainAttr<User> implements UPlainAttr {
private static final long serialVersionUID = 6333601983691157406L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd1f28f8/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 6890a9b..c6e2f14 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -415,7 +415,7 @@ under the License.
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.38</version>
+ <version>5.1.39</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -451,7 +451,7 @@ under the License.
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>1.1.9</version>
+ <version>1.4.6</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -515,15 +515,15 @@ under the License.
<id>sqlserver-it</id>
<properties>
- <jdbcdriver.groupId>com.microsoft.sqlserver</jdbcdriver.groupId>
- <jdbcdriver.artifactId>sqljdbc42</jdbcdriver.artifactId>
+ <jdbcdriver.groupId>net.sourceforge.jtds</jdbcdriver.groupId>
+ <jdbcdriver.artifactId>jtds</jdbcdriver.artifactId>
</properties>
<dependencies>
<dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>sqljdbc42</artifactId>
- <version>4.2</version>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd1f28f8/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties b/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
index 2dedf76..ce96a3e 100644
--- a/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
@@ -14,8 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-Master.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-Master.url=jdbc:sqlserver://teak:1433;database=syncope;selectMethod=cursor;sendStringParametersAsUnicode=false
+Master.driverClassName=net.sourceforge.jtds.jdbc.Driver
+Master.url=jdbc:jtds:sqlserver://teak:1433/syncope
Master.schema=dbo
Master.username=syncope
Master.password=syncope
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd1f28f8/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index 2a7cf78..30148e5 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -842,7 +842,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
assertFalse(user.getResources().isEmpty());
// 2. Check that the DB resource has the correct password
- final JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource);
String value = jdbcTemplate.queryForObject(
"SELECT PASSWORD FROM test WHERE ID=?", String.class, user.getUsername());
assertEquals(Encryptor.getInstance().encode("security123", CipherAlgorithm.SHA1), value.toUpperCase());