From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 23 Nov 2011 21:12:08 +0000 (+0000)
Subject: CSPACE-2818, CSPACE-3537 Refactored logic that handles authorityRefs, refObjs, and... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=71e2b4227bd3fd3f1c834b042f02e8c8a540ac63;p=tmp%2Fjakarta-migration.git

CSPACE-2818, CSPACE-3537 Refactored logic that handles authorityRefs, refObjs, and displayName update, so that it can handle authRefs in deeply nested structures. Still awaiting latest code from Nuxeo to integrate their updated search, but this change at least fixes 2818, and makes us ready for the fix for 3537 and 2323. Also cleaned up handling of authorityRefs for garbage values - now produces a log error and does not produce an authorityRef item (was producing an empty one). Also added a partial fix and notes to remove the hard-coded resource paths for authority types.
---

71e2b4227bd3fd3f1c834b042f02e8c8a540ac63
diff --cc services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/1-bigbird-permission.xml
index 30c459671,30c459671..b806b583f
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/1-bigbird-permission.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/1-bigbird-permission.xml
@@@ -1,6 -1,6 +1,5 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
--<ns2:permission
--xmlns:ns2="http://collectionspace.org/services/authorization">
++<ns2:permission xmlns:ns2="http://collectionspace.org/services/authorization/perms">
    <resourceName>dimensions</resourceName>
    <action>
      <name>CREATE</name>
diff --cc services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/2-elmo-permission.xml
index 25f05dff1,8396775f1..684999962
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/2-elmo-permission.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/2-elmo-permission.xml
@@@ -1,6 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
- <ns3:permission xmlns:ns2="http://collectionspace.org/services/hyperjaxb"
-     xmlns:ns3="http://collectionspace.org/services/authorization/perms">
 -<ns2:permission   xmlns:ns2="http://collectionspace.org/services/authorization">
++<ns3:permission xmlns:ns3="http://collectionspace.org/services/authorization/perms">
    <resourceName>dimensions</resourceName>
    <action>
      <name>READ</name>
diff --cc services/authorization-mgt/import/pom.xml
index 27991d4db,d74206c25..4be670b0a
--- a/services/authorization-mgt/import/pom.xml
+++ b/services/authorization-mgt/import/pom.xml
@@@ -197,20 -195,18 +197,22 @@@
                      <systemProperties>
                      </systemProperties>
                  </configuration>
 +				
                  <dependencies>
++									<!--
                      <dependency>
                          <groupId>mysql</groupId>
                          <artifactId>mysql-connector-java</artifactId>
 -												<version>5.1.5</version>
 +						<version>${mysql.driver.version}</version>
                      </dependency>
 -										<dependency>
 -												<groupId>postgresql</groupId>
 -												<artifactId>postgresql</artifactId>
 -												<version>8.4-702.jdbc4</version>
 -										</dependency>
++										-->
 +					<dependency>
 +						<groupId>postgresql</groupId>
 +						<artifactId>postgresql</artifactId>
 +						<version>${postgres.driver.version}</version>
 +					</dependency>
                  </dependencies>
 +				
              </plugin>
          </plugins>