Merged DEV/SWIFT to HEAD

26495: Removed svn:mergeinfo from 'root'
   26520: Fixed targetSchema values for merged-in patches
   26521: ALF-5260 - RINF 06: Switch from iBatis to MyBatis
          - fix for selectChildAssocsWithoutParentAssocsOfType and selectChildAssocsByChildTypes
   26531: Removed obsolete code to fix compilation error following OpenCMIS updates.
   26551: Patch to remove old alf_*attribute* tables (ALF-3192, ALF-6724)
   26555: Fixed ALF-7960: Upgrade incorrectly reports zero patches run
          - Use JdbcType.TIMESTAMP instead of DATE to prevent time truncation in alf_applied_patch
   26557: Patch to remove old alf_*attribute* tables (ALF-3192, ALF-6724)
          - Support for all DBs
          - Included removal of sequence
          - Uses DAO hierarchical bean override for sequence removal
   26577: SWIFT: fix AuthenticationTest.* fails
          - fallout from r25966 - keep "validate" as R/O but put back txn propogation (as before)
   26583: SWIFT build: fix DefaultTypeConverterTest.testInterConversions()
          - fallout from OpenCMIS merge (r25458)
   26615: Remove svn:mergeinfo from root (again)
   26646: Test case addition related to ALF-619. setMembership() method on SiteService needs to check that the given site 'role' is valid.
          This issue was not reproduced. I'm checking in the test code I used to ensure that invalid roles are rejected.
          It'll keep the exception type stable from now on too (not implying it wasn't stable in the past!)
   26744: ALF-8061 - MyBatis: fix mappings for Oracle (nullable parameters) - Activities, Audit, AVM
   26745: Created NodeLocatorService which allows access to registered NodeLocators.
          Also created node-location.get webscript which provides access to the NodeLocationService via a RESTful webscript.
   26774: Fixing failing NodeLocationServiceImplTest.
   26799: ALF-8061 - MyBatis: fix mappings for Oracle (nullable parameters)
          - follow-on to r26744
   26809: Fixed ALF-8157: Method removeSeconaryChildAssociation() in NodeService is spelt incorrectly
          - Old method is Deprecated and final
          - Redirect implementations to correctly-named method
   26869: Javadoc update for LockService.
   28254: ALF-8805: RINF 40: Lucene Removal: PersonService API
          - follow-on (remove unused SearchService)
Note: Tested repo upgrade from V3.3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28282 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-06-08 14:47:59 +00:00
parent e25cd8eb7e
commit 8e6c0d9c00
45 changed files with 3111 additions and 2178 deletions

View File

@@ -253,60 +253,6 @@ CREATE TABLE alf_locale
UNIQUE KEY locale_str (locale_str)
) ENGINE=InnoDB;
CREATE TABLE alf_attributes
(
id BIGINT NOT NULL AUTO_INCREMENT,
type VARCHAR(1) NOT NULL,
version BIGINT NOT NULL,
acl_id BIGINT,
bool_value BIT,
byte_value TINYINT,
short_value SMALLINT,
int_value INTEGER,
long_value BIGINT,
float_value FLOAT,
double_value DOUBLE PRECISION,
string_value TEXT,
serializable_value BLOB,
PRIMARY KEY (id),
KEY fk_alf_attr_acl (acl_id),
CONSTRAINT fk_alf_attr_acl FOREIGN KEY (acl_id) REFERENCES alf_access_control_list (id)
) ENGINE=InnoDB;
CREATE TABLE alf_global_attributes
(
name VARCHAR(160) NOT NULL,
attribute BIGINT,
PRIMARY KEY (name),
UNIQUE KEY attribute (attribute),
KEY fk_alf_gatt_att (attribute),
CONSTRAINT fk_alf_gatt_att FOREIGN KEY (attribute) REFERENCES alf_attributes (id)
) ENGINE=InnoDB;
CREATE TABLE alf_list_attribute_entries
(
list_id BIGINT NOT NULL,
mindex INTEGER NOT NULL,
attribute_id BIGINT,
PRIMARY KEY (list_id, mindex),
KEY fk_alf_lent_att (attribute_id),
KEY fk_alf_lent_latt (list_id),
CONSTRAINT fk_alf_lent_att FOREIGN KEY (attribute_id) REFERENCES alf_attributes (id),
CONSTRAINT fk_alf_lent_latt FOREIGN KEY (list_id) REFERENCES alf_attributes (id)
) ENGINE=InnoDB;
CREATE TABLE alf_map_attribute_entries
(
map_id BIGINT NOT NULL,
mkey VARCHAR(160) NOT NULL,
attribute_id BIGINT,
PRIMARY KEY (map_id, mkey),
KEY fk_alf_matt_matt (map_id),
KEY fk_alf_matt_att (attribute_id),
CONSTRAINT fk_alf_matt_att FOREIGN KEY (attribute_id) REFERENCES alf_attributes (id),
CONSTRAINT fk_alf_matt_matt FOREIGN KEY (map_id) REFERENCES alf_attributes (id)
) ENGINE=InnoDB;
CREATE TABLE alf_node_aspects
(
node_id BIGINT NOT NULL,