Repository: airavata
Updated Branches:
refs/heads/develop 8e08042f9 -> 0bde5a6a9
fixing AIRAVATA-2309
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0bde5a6a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0bde5a6a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0bde5a6a
Branch: refs/heads/develop
Commit: 0bde5a6a95166d11b50eba95de00bbfb89aa0394
Parents: 8e08042
Author: scnakandala <su...@gmail.com>
Authored: Mon Jan 30 09:53:14 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jan 30 09:53:14 2017 -0500
----------------------------------------------------------------------
.../src/main/resources/META-INF/persistence.xml | 4 ----
.../src/main/resources/sharing-registry-mysql.sql | 18 +++++++++---------
2 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0bde5a6a/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml b/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml
index 5e4f132..a9f808c 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml
@@ -11,9 +11,5 @@
<class>org.apache.airavata.sharing.registry.db.entities.SharingEntity</class>
<class>org.apache.airavata.sharing.registry.db.entities.UserEntity</class>
<class>org.apache.airavata.sharing.registry.db.entities.UserGroupEntity</class>
- <properties>
- <property name="hibernate.connection.useUnicode" value="false"/>
- <property name="hibernate.connection.characterEncoding" value="latin1"/>
- </properties>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0bde5a6a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
index 7697d52..d4ec07c 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
@@ -26,7 +26,7 @@ CREATE TABLE DOMAIN (
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (DOMAIN_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
CREATE TABLE SHARING_USER (
USER_ID VARCHAR(255) NOT NULL,
@@ -40,7 +40,7 @@ CREATE TABLE SHARING_USER (
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (USER_ID, DOMAIN_ID),
FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
CREATE TABLE USER_GROUP (
GROUP_ID VARCHAR(255) NOT NULL,
@@ -54,7 +54,7 @@ CREATE TABLE USER_GROUP (
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (GROUP_ID, DOMAIN_ID),
FOREIGN KEY (OWNER_ID, DOMAIN_ID) REFERENCES SHARING_USER(USER_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
CREATE TABLE GROUP_MEMBERSHIP (
@@ -67,7 +67,7 @@ CREATE TABLE GROUP_MEMBERSHIP (
PRIMARY KEY (PARENT_ID, CHILD_ID, DOMAIN_ID),
FOREIGN KEY (PARENT_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
FOREIGN KEY (CHILD_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
CREATE TABLE ENTITY_TYPE (
ENTITY_TYPE_ID VARCHAR(255) NOT NULL,
@@ -78,7 +78,7 @@ CREATE TABLE ENTITY_TYPE (
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_TYPE_ID, DOMAIN_ID),
FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
CREATE TABLE PERMISSION_TYPE (
PERMISSION_TYPE_ID VARCHAR(255) NOT NULL,
@@ -89,7 +89,7 @@ CREATE TABLE PERMISSION_TYPE (
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (PERMISSION_TYPE_ID, DOMAIN_ID),
FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
CREATE TABLE ENTITY (
ENTITY_ID VARCHAR(255) NOT NULL,
@@ -108,7 +108,7 @@ CREATE TABLE ENTITY (
FOREIGN KEY (ENTITY_TYPE_ID, DOMAIN_ID) REFERENCES ENTITY_TYPE(ENTITY_TYPE_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
FOREIGN KEY (OWNER_ID, DOMAIN_ID) REFERENCES SHARING_USER(USER_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
FOREIGN KEY (PARENT_ENTITY_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
ALTER TABLE ENTITY ADD FULLTEXT FULL_TEXT_INDEX(FULL_TEXT);
@@ -126,13 +126,13 @@ CREATE TABLE SHARING (
FOREIGN KEY (ENTITY_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
FOREIGN KEY (INHERITED_PARENT_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
FOREIGN KEY (GROUP_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
CREATE TABLE CONFIGURATION
(
CONFIG_KEY VARCHAR(255) NOT NULL,
CONFIG_VALUE VARCHAR(255) NOT NULL,
PRIMARY KEY(CONFIG_KEY, CONFIG_VALUE)
-);
+)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VALUE) VALUES('sharing_reg_version', '0.17');
\ No newline at end of file