update NEWS

NEWS.md

@@ -1,4 +1,5 @@
 ## 1.1.0 Unreleased
+ * Improve Search Functionality
  * Template Management
  * Holding Management
 

pom.xml

@@ -271,7 +271,7 @@
               <outputDirectory>${basedir}/target/classes/apidocs/raml</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${ramlfiles_path}</directory>
+                  <directory>${ramlfiles_util_path}</directory>
                   <filtering>true</filtering>
                 </resource>
               </resources>

src/main/java/org/folio/marccat/action/LibrisuiteAction.java

@@ -1,6 +1,6 @@
-package org.folio.cataloging.action;
+package org.folio.marccat.action;
 
-import org.folio.cataloging.dao.DAOCodeTable;
+import org.folio.marccat.dao.DAOCodeTable;
 
 // TODO: REMOVE
 public abstract class LibrisuiteAction {

src/main/java/org/folio/marccat/action/cataloguing/bibliographic/SaveTagException.java

@@ -1,6 +1,6 @@
-package org.folio.cataloging.action.cataloguing.bibliographic;
+package org.folio.marccat.action.cataloguing.bibliographic;
 
-import org.folio.cataloging.exception.ModCatalogingException;
+import org.folio.marccat.exception.ModCatalogingException;
 
 public class SaveTagException extends ModCatalogingException {
   protected int tagIndex = 0;

src/main/java/org/folio/marccat/bean/cataloguing/copy/CopyListElement.java

@@ -1,6 +1,6 @@
-package org.folio.cataloging.bean.cataloguing.copy;
+package org.folio.marccat.bean.cataloguing.copy;
 
-import org.folio.cataloging.dao.persistence.CPY_ID;
+import org.folio.marccat.dao.persistence.CPY_ID;
 
 import java.util.List;
 import java.util.Vector;

src/main/java/org/folio/marccat/bean/cataloguing/copy/CopyNoteListElement.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.bean.cataloguing.copy;
+package org.folio.marccat.bean.cataloguing.copy;
 
 /**
  * @author elena

src/main/java/org/folio/marccat/business/Command.java

@@ -5,9 +5,9 @@
  *
  * Command.java
  */
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
-import org.folio.cataloging.business.common.DataAccessException;
+import org.folio.marccat.business.common.DataAccessException;
 
 /**
  * Interface for implementing undo/redo

src/main/java/org/folio/marccat/business/ComparatorCustomCodeAsc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorCustomCodeDesc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorCustomNameAsc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorCustomNameDesc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorCustomStatusAsc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorCustomStatusDesc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorCustomTypologyAsc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorCustomTypologyDesc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorMasterCodeAsc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorMasterCodeDesc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorMasterNameAsc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorMasterNameDesc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorMasterStatusAsc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorMasterStatusDesc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/ComparatorMasterTypologyDesc.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 import java.util.Comparator;
 

src/main/java/org/folio/marccat/business/MasterListElement.java

@@ -1,7 +1,7 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
 
-import org.folio.cataloging.dao.persistence.CollectionMaster;
+import org.folio.marccat.dao.persistence.CollectionMaster;
 
 import java.sql.Date;
 

src/main/java/org/folio/marccat/business/PublisherListElement.java

@@ -1,6 +1,6 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
-import org.folio.cataloging.dao.persistence.CollectionPublisher;
+import org.folio.marccat.dao.persistence.CollectionPublisher;
 
 import java.sql.Date;
 

src/main/java/org/folio/marccat/business/RuleListElement.java

@@ -1,6 +1,6 @@
-package org.folio.cataloging.business;
+package org.folio.marccat.business;
 
-import org.folio.cataloging.dao.persistence.CLCTN_MST_RULE;
+import org.folio.marccat.dao.persistence.CLCTN_MST_RULE;
 
 // TODO: Javadoc
 public class RuleListElement {

src/main/java/org/folio/marccat/business/amicusSearchEngine/FindRequest.java

@@ -5,13 +5,13 @@
  *
  * FindRequest.java
  */
-package org.folio.cataloging.business.amicusSearchEngine;
+package org.folio.marccat.business.amicusSearchEngine;
 
-import org.folio.cataloging.business.authorisation.AuthorisationException;
-import org.folio.cataloging.business.common.Defaults;
-import org.folio.cataloging.business.common.SocketMessage;
-import org.folio.cataloging.business.controller.UserProfile;
-import org.folio.cataloging.dao.common.HibernateUtil;
+import org.folio.marccat.business.authorisation.AuthorisationException;
+import org.folio.marccat.business.common.Defaults;
+import org.folio.marccat.business.common.SocketMessage;
+import org.folio.marccat.business.controller.UserProfile;
+import org.folio.marccat.dao.common.HibernateUtil;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

src/main/java/org/folio/marccat/business/amicusSearchEngine/FindResponse.java

@@ -5,12 +5,12 @@
  *
  * FindResponse.java
  */
-package org.folio.cataloging.business.amicusSearchEngine;
+package org.folio.marccat.business.amicusSearchEngine;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.folio.cataloging.business.common.SocketMessage;
-import org.folio.cataloging.exception.*;
+import org.folio.marccat.business.common.SocketMessage;
+import org.folio.marccat.exception.*;
 
 import java.io.*;
 

src/main/java/org/folio/marccat/business/authentication/AuthenticationBroker.java

@@ -2,9 +2,9 @@
  * Standard interface to authentication brokers
  * Created on May 5, 2004
  */
-package org.folio.cataloging.business.authentication;
+package org.folio.marccat.business.authentication;
 
-import org.folio.cataloging.exception.ConnectException;
+import org.folio.marccat.exception.ConnectException;
 
 
 /**

src/main/java/org/folio/marccat/business/authentication/AuthenticationException.java

@@ -1,9 +1,9 @@
 /*
  * Created on Jun 10, 2004
  */
-package org.folio.cataloging.business.authentication;
+package org.folio.marccat.business.authentication;
 
-import org.folio.cataloging.exception.ModCatalogingException;
+import org.folio.marccat.exception.ModCatalogingException;
 
 /**
  * An extendable exception to represent authentication exceptions thrown by implementations

src/main/java/org/folio/marccat/business/authentication/InvalidPasswordFormatException.java

@@ -5,7 +5,7 @@
  *
  * InvalidPasswordFormatException.java
  */
-package org.folio.cataloging.business.authentication;
+package org.folio.marccat.business.authentication;
 
 /**
  * Denotes an improper format for password

src/main/java/org/folio/marccat/business/authentication/PasswordDuplicatesPreviousException.java

@@ -5,7 +5,7 @@
  *
  * PasswordDuplicatesPreviousException.java
  */
-package org.folio.cataloging.business.authentication;
+package org.folio.marccat.business.authentication;
 
 /**
  * Denotes an attempt to reuse a previous password when

src/main/java/org/folio/marccat/business/authentication/PasswordExpiredException.java

@@ -4,7 +4,7 @@
  * To change the template for this generated file go to
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
-package org.folio.cataloging.business.authentication;
+package org.folio.marccat.business.authentication;
 
 /**
  * Denotes that the user's password has expired

src/main/java/org/folio/marccat/business/authorisation/AmicusAuthority.java

@@ -5,11 +5,11 @@
  *
  * AmicusAuthority.java
  */
-package org.folio.cataloging.business.authorisation;
+package org.folio.marccat.business.authorisation;
 
-import org.folio.cataloging.business.common.DataAccessException;
-import org.folio.cataloging.dao.DAOUserAccount;
-import org.folio.cataloging.dao.persistence.USR_ACNT;
+import org.folio.marccat.business.common.DataAccessException;
+import org.folio.marccat.dao.DAOUserAccount;
+import org.folio.marccat.dao.persistence.USR_ACNT;
 
 import java.util.*;
 

src/main/java/org/folio/marccat/business/authorisation/AuthorisationAgent.java

@@ -1,4 +1,4 @@
-package org.folio.cataloging.business.authorisation;
+package org.folio.marccat.business.authorisation;
 
 /**
  * @author paulm

src/main/java/org/folio/marccat/business/authorisation/AuthorisationException.java

@@ -5,9 +5,9 @@
  *
  * AuthorisationException.java
  */
-package org.folio.cataloging.business.authorisation;
+package org.folio.marccat.business.authorisation;
 
-import org.folio.cataloging.exception.ModCatalogingException;
+import org.folio.marccat.exception.ModCatalogingException;
 
 /**
  * @author paulm

src/main/java/org/folio/marccat/business/authorisation/ModuleAuthorisation.java

@@ -5,7 +5,7 @@
  *
  * ModuleAuthorisation.java
  */
-package org.folio.cataloging.business.authorisation;
+package org.folio.marccat.business.authorisation;
 
 import java.io.Serializable;
 

src/main/java/org/folio/marccat/business/authorisation/Permission.java

@@ -5,7 +5,7 @@
  *
  * Permission.java
  */
-package org.folio.cataloging.business.authorisation;
+package org.folio.marccat.business.authorisation;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 

src/main/java/org/folio/marccat/business/authorisation/Policy.java

@@ -5,7 +5,7 @@
  *
  * Policy.java
  */
-package org.folio.cataloging.business.authorisation;
+package org.folio.marccat.business.authorisation;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/org/folio/marccat/business/authorisation/TagAuthorisation.java

@@ -5,7 +5,7 @@
  *
  * TagAuthorisation.java
  */
-package org.folio.cataloging.business.authorisation;
+package org.folio.marccat.business.authorisation;
 
 import java.io.Serializable;
 

src/main/java/org/folio/marccat/business/cataloguing/authority/Authority008Tag.java

@@ -5,12 +5,12 @@
  *
  * Authority008Tag.java
  */
-package org.folio.cataloging.business.cataloguing.authority;
+package org.folio.marccat.business.cataloguing.authority;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.folio.cataloging.business.cataloguing.bibliographic.FixedFieldUsingItemEntity;
-import org.folio.cataloging.dao.persistence.AUT;
+import org.folio.marccat.business.cataloguing.bibliographic.FixedFieldUsingItemEntity;
+import org.folio.marccat.dao.persistence.AUT;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

src/main/java/org/folio/marccat/business/cataloguing/authority/AuthorityAccessPoint.java

@@ -5,12 +5,12 @@
  *
  * AuthorityAccessPoint.java
  */
-package org.folio.cataloging.business.cataloguing.authority;
+package org.folio.marccat.business.cataloguing.authority;
 
-import org.folio.cataloging.business.cataloguing.bibliographic.PersistsViaItem;
-import org.folio.cataloging.dao.persistence.AUT;
-import org.folio.cataloging.dao.persistence.AccessPoint;
-import org.folio.cataloging.dao.persistence.ItemEntity;
+import org.folio.marccat.business.cataloguing.bibliographic.PersistsViaItem;
+import org.folio.marccat.dao.persistence.AUT;
+import org.folio.marccat.dao.persistence.AccessPoint;
+import org.folio.marccat.dao.persistence.ItemEntity;
 
 /**
  * @author paulm

src/main/java/org/folio/marccat/business/cataloguing/authority/AuthorityAuthenticationCodeTag.java

@@ -1,6 +1,6 @@
-package org.folio.cataloging.business.cataloguing.authority;
+package org.folio.marccat.business.cataloguing.authority;
 
-import org.folio.cataloging.business.cataloguing.common.AuthenticationCodeTag;
+import org.folio.marccat.business.cataloguing.common.AuthenticationCodeTag;
 
 /**
  * @author paulm