From: remillet <remillet@yahoo.com>
Date: Mon, 2 Mar 2015 23:28:38 +0000 (-0800)
Subject: CSPACE-6375:Some minor changes to get compile working.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f254aa394df62be8259da4a5b901634dadf80d86;p=tmp%2Fjakarta-migration.git

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 89a20b8fd..e78f30801 100644
--- 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 7787b8615..9b26d519b 100644
--- 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 875a72f9a..45d80c610 100644
--- 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 76ff48353..28f7ba775 100644
--- 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 4600233e9..c939cd8ba 100644
--- 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 d6344da2d..818847fae 100644
--- 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";