CSPACE-6375:Some minor changes to get compile working.

diff --git a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
index 89a20b8fd9f4b229a9b94950e2533db846ee8977..e78f308019956a22fef689ec44fee1db279bf75a 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
+++ b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-             http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <persistence-unit name="org.collectionspace.services">
+       http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
+       xmlns="http://java.sun.com/xml/ns/persistence" 
+       xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence-unit name="org.collectionspace.services">
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
                <!-- Until our JNDI issue with Nuxeo is resolved, we can't use this datasource element
         <non-jta-data-source>CspaceDS</non-jta-data-source> -->
@@ -9,7 +12,7 @@
         <class>org.collectionspace.services.account.AccountsCommon</class>
         <class>org.collectionspace.services.account.Tenant</class>
         <class>org.collectionspace.services.account.AccountTenant</class>
-        <class>org.collectionspace.services.account.Status</class>
+        <class>org.collectionspace.services.account.Status</class>        
         <class>org.collectionspace.services.authentication.User</class>
         <class>org.collectionspace.services.authorization.perms.Permission</class>
         <class>org.collectionspace.services.authorization.perms.PermissionAction</class>

diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index 7787b8615b5cb15879b4538dad8f96234266f7ba..9b26d519b5d5bf31a04dc8cbdd1cb5b54030759c 100644 (file)
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -9,7 +9,6 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.account.client</artifactId>
     <name>services.account.client</name>
 
@@ -92,7 +91,6 @@
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
         </dependency>
     </dependencies>
 

diff --git a/services/account/client/src/test/resources/META-INF/persistence.xml b/services/account/client/src/test/resources/META-INF/persistence.xml
index 875a72f9a7a4f694b80108067f28828ac2763481..45d80c610b34d5589677cd437fd6abaa0a27fee0 100644 (file)
--- a/services/account/client/src/test/resources/META-INF/persistence.xml
+++ b/services/account/client/src/test/resources/META-INF/persistence.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-             http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <persistence-unit name="org.collectionspace.services.account">
+       http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" 
+       xmlns="http://java.sun.com/xml/ns/persistence" 
+       xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence-unit name="org.collectionspace.services.account">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
         <class>org.collectionspace.services.account.AccountsCommon</class>
         <class>org.collectionspace.services.account.AccountsCommonList</class>
         <class>org.collectionspace.services.account.AccountListItem</class>

diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index 76ff48353d2477d8aa651792a94cc14b5373b5fa..28f7ba775a2609717399eaa9dc75c8028e736ee9 100644 (file)
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -8,7 +8,6 @@
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
-       <groupId>org.collectionspace.services</groupId>
        <artifactId>org.collectionspace.services.account.pstore</artifactId>
        <name>services.account.pstore</name>
 

diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
index 4600233e97a7a483349836ae1eaeda6d090fbed5..c939cd8ba40e2c6d156b96eae3cb00676836e925 100644 (file)
--- a/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
+++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
@@ -29,14 +29,12 @@ package org.collectionspace;
 
 import java.io.PrintStream;
 
-import net.sf.ehcache.CacheException;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.collectionspace.services.authorization.driver.AuthorizationSeedDriver;
-import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java
index d6344da2d88c74d483ba447a788a49811f666416..818847faebb960d9ccacd20b87d9be7edec137c4 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java
@@ -113,7 +113,8 @@ public class NuxeoBlobUtils {
     private static final String NUXEO_FILENAME_VALID_STRING = "[a-zA-Z_0-9-.%:/\\ ]+";
 
        public static final String DOCUMENT_PLACEHOLDER_IMAGE = "documentImage.jpg";
-       //public static final String DOCUMENT_MISSING_PLACEHOLDER_IMAGE = "documentImageMissing.jpg";
+       public static final String DOCUMENT_MISSING_PLACEHOLDER_IMAGE = "documentImageMissing.jpg";
+       
        public static final String DOCUMENT_PLACEHOLDER_CSV  = "documentCSV.jpg";
        public static final String DOCUMENT_PLACEHOLDER_DOC  = "documentDOC.jpg";
        public static final String DOCUMENT_PLACEHOLDER_DOCX = "documentDOC.jpg";