Ensuring Oracle DB works
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/01790974 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/01790974 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/01790974 Branch: refs/heads/master Commit: 017909743d9aa7c19a44cfd2c67b7f5d72e87f89 Parents: 0dc6593 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Fri Jun 23 10:55:58 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Fri Jun 23 10:56:30 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/syncope/core/logic/DynRealmLogic.java | 4 ++-- core/persistence-jpa/src/main/resources/views.xml | 4 ++-- fit/core-reference/pom.xml | 10 +++++----- .../src/main/resources/oracle/domains/Master.properties | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/01790974/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java index bed7028..c0ab811 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java @@ -68,7 +68,7 @@ public class DynRealmLogic extends AbstractTransactionalLogic<DynRealmTO> { @PreAuthorize("hasRole('" + StandardEntitlement.DYNREALM_CREATE + "')") public DynRealmTO create(final DynRealmTO dynRealmTO) { - return binder.getDynRealmTO(dynRealmDAO.save(binder.create(dynRealmTO))); + return binder.getDynRealmTO(binder.create(dynRealmTO)); } @PreAuthorize("hasRole('" + StandardEntitlement.DYNREALM_UPDATE + "')") @@ -79,7 +79,7 @@ public class DynRealmLogic extends AbstractTransactionalLogic<DynRealmTO> { throw new NotFoundException(dynRealmTO.getKey()); } - return binder.getDynRealmTO(dynRealmDAO.save(binder.update(dynRealm, dynRealmTO))); + return binder.getDynRealmTO(binder.update(dynRealm, dynRealmTO)); } @PreAuthorize("hasRole('" + StandardEntitlement.DYNREALM_DELETE + "')") http://git-wip-us.apache.org/repos/asf/syncope/blob/01790974/core/persistence-jpa/src/main/resources/views.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/resources/views.xml b/core/persistence-jpa/src/main/resources/views.xml index bcff6b9..88b4bb8 100644 --- a/core/persistence-jpa/src/main/resources/views.xml +++ b/core/persistence-jpa/src/main/resources/views.xml @@ -36,13 +36,13 @@ under the License. <entry key="DynRoleMembers"> CREATE TABLE DynRoleMembers( any_id CHAR(36), - role_id CHAR(36), + role_id VARCHAR(255), UNIQUE(any_id, role_id)) </entry> <entry key="DynRealmMembers"> CREATE TABLE DynRealmMembers( any_id CHAR(36), - dynRealm_id CHAR(36), + dynRealm_id VARCHAR(255), UNIQUE(any_id, dynRealm_id)) </entry> http://git-wip-us.apache.org/repos/asf/syncope/blob/01790974/fit/core-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index df2aa32..9652533 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -591,15 +591,15 @@ under the License. <id>oracle-it</id> <properties> - <jdbcdriver.groupId>com.oracle</jdbcdriver.groupId> - <jdbcdriver.artifactId>ojdbc6</jdbcdriver.artifactId> + <jdbcdriver.groupId>com.oracle.jdbc</jdbcdriver.groupId> + <jdbcdriver.artifactId>ojdbc8</jdbcdriver.artifactId> </properties> <dependencies> <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc6</artifactId> - <version>11.2.0.4</version> + <groupId>com.oracle.jdbc</groupId> + <artifactId>ojdbc8</artifactId> + <version>12.2.0.1</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/syncope/blob/01790974/fit/core-reference/src/main/resources/oracle/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/oracle/domains/Master.properties b/fit/core-reference/src/main/resources/oracle/domains/Master.properties index 13c3c9f..f4ce757 100644 --- a/fit/core-reference/src/main/resources/oracle/domains/Master.properties +++ b/fit/core-reference/src/main/resources/oracle/domains/Master.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. Master.driverClassName=oracle.jdbc.OracleDriver -Master.url=jdbc:oracle:thin:@pioppo:1521:orcl +Master.url=jdbc:oracle:thin:@localhost:1521:XE Master.schema=SYNCOPE Master.username=syncope Master.password=syncope
