inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)

Browse Source 
113213 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
      113209 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         113124: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
            - Added the scripts to the main code base.
            - Updated the authorised-users.jar,
         113203: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
            - Moved the patch to the main code.
            - Updated the authorised-users.jar
         113128: MNT-14867 (MNT-13871) : [UserAuth] License user limit exceeded by adding users to ALFRESCO_ADMINISTRATORS LDAP group
            - Updated auhtorised-users jar.,


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-09-28 14:07:01 +00:00
parent 9acb2289d3
commit f3dca62beb
7 changed files with 200 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql Normal file
View File

@@ -0,0 +1,34 @@
--
-- Title: Create Authorization Status
-- Database: MySQL InnoDB
-- Since: V4.1.11 Schema 5156
-- Author: Pavel Yurkevich
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
CREATE TABLE alf_auth_status
(
id BIGINT NOT NULL AUTO_INCREMENT,
username VARCHAR(100) NOT NULL,
deleted BIT NOT NULL,
authorized BIT NOT NULL,
checksum BLOB NOT NULL,
authaction VARCHAR(10) NOT NULL,
UNIQUE INDEX idx_alf_auth_usr_stat (username, authorized),
INDEX idx_alf_auth_action (authaction),
INDEX idx_alf_auth_deleted (deleted),
PRIMARY KEY (id)
) ENGINE=InnoDB;
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.1-AuthorizationTables';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V4.1-AuthorizationTables', 'Manually executed script upgrade V4.1: Authorization status tables',
0, 6075, -1, 6076, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
);

58
config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
View File

@@ -765,6 +765,64 @@
</index>
</indexes>
</table>
<table name="alf_auth_status">
<columns>
<column name="id" order="1">
<type>bigint</type>
<nullable>false</nullable>
<autoincrement>true</autoincrement>
</column>
<column name="username" order="2">
<type>varchar(100)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="deleted" order="3">
<type>bit</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="authorized" order="4">
<type>bit</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="checksum" order="5">
<type>blob</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="authaction" order="6">
<type>varchar(10)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="PRIMARY">
<columnnames>
<columnname order="1">id</columnname>
</columnnames>
</primarykey>
<foreignkeys/>
<indexes>
<index name="idx_alf_auth_usr_stat" unique="true">
<columnnames>
<columnname>username</columnname>
<columnname>authorized</columnname>
</columnnames>
</index>
<index name="idx_alf_auth_deleted" unique="false">
<columnnames>
<columnname>deleted</columnname>
</columnnames>
</index>
<index name="idx_alf_auth_action" unique="false">
<columnnames>
<columnname>authaction</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="alf_authority">
<columns>
<column name="id" order="1">

35
config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql Normal file
View File

@@ -0,0 +1,35 @@
--
-- Title: Create Authorization Status
-- Database: PostgreSQL
-- Since: V4.1.11 Schema 5156
-- Author: Alex Mukha
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
CREATE SEQUENCE alf_auth_status_seq START WITH 1 INCREMENT BY 1;
CREATE TABLE alf_auth_status
(
id INT8 NOT NULL,
username VARCHAR(100) NOT NULL,
deleted BOOL NOT NULL,
authorized BOOL NOT NULL,
checksum BYTEA NOT NULL,
authaction VARCHAR(10) NOT NULL,
PRIMARY KEY (id)
);
CREATE UNIQUE INDEX idx_alf_auth_usr_stat ON alf_auth_status (username, authorized);
CREATE INDEX idx_alf_auth_deleted ON alf_auth_status (deleted);
CREATE INDEX idx_alf_auth_action ON alf_auth_status (authaction);
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.1-AuthorizationTables';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V4.1-AuthorizationTables', 'Manually executed script upgrade V4.1: Authorization status tables',
0, 6075, -1, 6076, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
);

59
config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
View File

@@ -22,6 +22,7 @@
<sequence name="alf_audit_model_seq"/>
<sequence name="alf_authority_alias_seq"/>
<sequence name="alf_authority_seq"/>
<sequence name="alf_auth_status_seq"/>
<sequence name="alf_child_assoc_seq"/>
<sequence name="alf_content_data_seq"/>
<sequence name="alf_content_url_seq"/>
@@ -905,6 +906,64 @@
</index>
</indexes>
</table>
<table name="alf_auth_status">
<columns>
<column name="id" order="1">
<type>int8</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="username" order="2">
<type>varchar(100)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="deleted" order="3">
<type>bool</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="authorized" order="4">
<type>bool</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="checksum" order="5">
<type>bytea</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="authaction" order="6">
<type>varchar(10)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="alf_auth_status_pkey">
<columnnames>
<columnname order="1">id</columnname>
</columnnames>
</primarykey>
<indexes>
<index name="idx_alf_auth_usr_stat" unique="true">
<columnnames>
<columnname>username</columnname>
<columnname>authorized</columnname>
</columnnames>
</index>
<index name="idx_alf_auth_deleted" unique="false">
<columnnames>
<columnname>deleted</columnname>
</columnnames>
</index>
<index name="idx_alf_auth_action" unique="false">
<columnnames>
<columnname>authaction</columnname>
</columnnames>
</index>
</indexes>
<foreignkeys/>
</table>
<table name="alf_child_assoc">
<columns>
<column name="id" order="1">

2
config/alfresco/dbscripts/db-schema-context.xml
View File

@@ -22,6 +22,7 @@
<value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-UsageTables.sql</value>
<value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-SubscriptionTables.sql</value>
<value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-TenantTables.sql</value>
<value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-AuthorizationTables.sql</value>
</list>
</property>
</bean>
@@ -59,6 +60,7 @@
<ref bean="patch.db-V4.1-createIdxAlfNodeTQN" />
<ref bean="patch.db-V4.2-restructure-idx_alf_nprop_s-MSSQL" />
<ref bean="patch.db-V4.2-migrate-locale-multilingual" />
<ref bean="patch.db-V4.1-AuthorizationTables" />
<ref bean="patch.db-V5.0-ContentUrlEncryptionTables" />
<ref bean="patch.db-V5.1-metadata-query-indexes" />
</list>

11
config/alfresco/patch/patch-services-context.xml
View File

@@ -1224,4 +1224,15 @@
</bean>
</property>
</bean>
<bean id="patch.db-V4.1-AuthorizationTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V4.1-AuthorizationTables</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>9020</value></property>
<property name="targetSchema"><value>9021</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-AuthorizationTables.sql</value>
</property>
</bean>
</beans>

2
config/alfresco/version.properties
View File

@@ -23,4 +23,4 @@ version.build=r@scm-revision@-b@build-number@
# Schema number
version.schema=9020
version.schema=9021