CSPACE-2818, CSPACE-3537 Refactored logic that handles authorityRefs, refObjs, and...

diff --cc services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/1-bigbird-permission.xml
index 30c4596719c68301eb12bbba96f6a7d54165488f,30c4596719c68301eb12bbba96f6a7d54165488f..b806b583f0758fc00ba00ed7eef6d1a7b273c4a1
--- 1/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/1-bigbird-permission.xml
--- 2/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"?>\r
--<ns2:permission\r
--xmlns:ns2="http://collectionspace.org/services/authorization">\r
++<ns2:permission xmlns:ns2="http://collectionspace.org/services/authorization/perms">\r
    <resourceName>dimensions</resourceName>\r
    <action>\r
      <name>CREATE</name>\r

diff --cc services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/2-elmo-permission.xml
index 25f05dff121d1e68672c653d826ce252a9db7bb0,8396775f12fe6391c7e8ae9e304d519cc2414b40..6849999620350334ba311c827fc1a7c367b619b6
--- 1/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security/2-elmo-permission.xml
--- 2/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"?>\r
- <ns3:permission xmlns:ns2="http://collectionspace.org/services/hyperjaxb"\r
-     xmlns:ns3="http://collectionspace.org/services/authorization/perms">\r
 -<ns2:permission   xmlns:ns2="http://collectionspace.org/services/authorization">\r
++<ns3:permission xmlns:ns3="http://collectionspace.org/services/authorization/perms">\r
    <resourceName>dimensions</resourceName>\r
    <action>\r
      <name>READ</name>\r

diff --cc services/authorization-mgt/import/pom.xml
index 27991d4dbb072c9f7cedc8a7ab6bd2362e86c85c,d74206c25774924d9ec8e224e8bb586598bf008e..4be670b0ab79ee0e238390c0dca3af09891fe3bf
--- 1/services/authorization-mgt/import/pom.xml
--- 2/services/authorization-mgt/import/pom.xml
+++ b/services/authorization-mgt/import/pom.xml
@@@ -197,20 -195,18 +197,22 @@@
                      <systemProperties>\r
                      </systemProperties>\r
                  </configuration>\r
 +                              \r
                  <dependencies>\r
++                                                                      <!--\r
                      <dependency>\r
                          <groupId>mysql</groupId>\r
                          <artifactId>mysql-connector-java</artifactId>\r
 -                                                                                              <version>5.1.5</version>\r
 +                                              <version>${mysql.driver.version}</version>\r
                      </dependency>\r
 -                                                                              <dependency>\r
 -                                                                                              <groupId>postgresql</groupId>\r
 -                                                                                              <artifactId>postgresql</artifactId>\r
 -                                                                                              <version>8.4-702.jdbc4</version>\r
 -                                                                              </dependency>\r
++                                                                              -->\r
 +                                      <dependency>\r
 +                                              <groupId>postgresql</groupId>\r
 +                                              <artifactId>postgresql</artifactId>\r
 +                                              <version>${postgres.driver.version}</version>\r
 +                                      </dependency>\r
                  </dependencies>\r
 +                              \r
              </plugin>\r
          </plugins>\r
  \r

diff --cc services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
Simple merge

diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
Simple merge